[FFmpeg-devel] [PATCH 1/3] avcodec/bsf/dts2pts: Fix shadowing

[FFmpeg-devel] [PATCH 1/3] avcodec/bsf/dts2pts: Fix shadowing

[Andreas Rheinhardt]

Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@outlook.com>
---
 libavcodec/bsf/dts2pts.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/libavcodec/bsf/dts2pts.c b/libavcodec/bsf/dts2pts.c
index 53a54fb1cc..ba4dc43f84 100644
--- a/libavcodec/bsf/dts2pts.c
+++ b/libavcodec/bsf/dts2pts.c
@@ -269,8 +269,8 @@ static int h264_filter(AVBSFContext *ctx)
             h264->sps.offset_for_non_ref_pic         = sps->offset_for_non_ref_pic;
             h264->sps.offset_for_top_to_bottom_field = sps->offset_for_top_to_bottom_field;
             h264->sps.poc_cycle_length               = sps->num_ref_frames_in_pic_order_cnt_cycle;
-            for (int i = 0; i < h264->sps.poc_cycle_length; i++)
-                h264->sps.offset_for_ref_frame[i] = sps->offset_for_ref_frame[i];
+            for (int j = 0; j < h264->sps.poc_cycle_length; j++)
+                h264->sps.offset_for_ref_frame[j] = sps->offset_for_ref_frame[j];
 
             h264->picture_structure = sps->frame_mbs_only_flag ? 3 :
                                       (header->field_pic_flag ?
-- 
2.40.1

_______________________________________________
ffmpeg-devel mailing list
ffmpeg-devel@ffmpeg.org
https://ffmpeg.org/mailman/listinfo/ffmpeg-devel

To unsubscribe, visit link above, or email
ffmpeg-devel-request@ffmpeg.org with subject "unsubscribe".

[FFmpeg-devel] [PATCH 2/3] configure, avcodec/Makefile: Add h264parse->h264data, golomb dependencies

[Andreas Rheinhardt]

Fixes standalone compilation of the dts2pts BSF.

Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@outlook.com>
---
 configure           | 1 +
 libavcodec/Makefile | 4 ++--
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/configure b/configure
index beb1fa6d3c..d3377a2ba3 100755
--- a/configure
+++ b/configure
@@ -2855,6 +2855,7 @@ faandct_select="fdctdsp"
 faanidct_deps="faan"
 faanidct_select="idctdsp"
 h264dsp_select="startcode"
+h264parse_select="golomb"
 h264_sei_select="atsc_a53 golomb"
 hevcparse_select="golomb"
 hevc_sei_select="atsc_a53 golomb"
diff --git a/libavcodec/Makefile b/libavcodec/Makefile
index 3e8a44e89c..2443d2c6fd 100644
--- a/libavcodec/Makefile
+++ b/libavcodec/Makefile
@@ -100,8 +100,8 @@ OBJS-$(CONFIG_GOLOMB)                  += golomb.o
 OBJS-$(CONFIG_H263DSP)                 += h263dsp.o
 OBJS-$(CONFIG_H264CHROMA)              += h264chroma.o
 OBJS-$(CONFIG_H264DSP)                 += h264dsp.o h264idct.o
-OBJS-$(CONFIG_H264PARSE)               += h264_parse.o h264_ps.o h2645data.o \
-                                          h2645_parse.o h2645_vui.o
+OBJS-$(CONFIG_H264PARSE)               += h264_parse.o h264_ps.o h264data.o \
+                                          h2645data.o h2645_parse.o h2645_vui.o
 OBJS-$(CONFIG_H264PRED)                += h264pred.o
 OBJS-$(CONFIG_H264QPEL)                += h264qpel.o
 OBJS-$(CONFIG_H264_SEI)                += h264_sei.o h2645_sei.o
-- 
2.40.1

_______________________________________________
ffmpeg-devel mailing list
ffmpeg-devel@ffmpeg.org
https://ffmpeg.org/mailman/listinfo/ffmpeg-devel

To unsubscribe, visit link above, or email
ffmpeg-devel-request@ffmpeg.org with subject "unsubscribe".

[FFmpeg-devel] [PATCH 3/3] configure: Add missing ftr_parser->adts_header, mpeg4audio dependencies

[Andreas Rheinhardt]

Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@outlook.com>
---
 configure | 1 +
 1 file changed, 1 insertion(+)

diff --git a/configure b/configure
index d3377a2ba3..c6a559bb9b 100755
--- a/configure
+++ b/configure
@@ -3424,6 +3424,7 @@ av1_vaapi_encoder_select="cbs_av1 vaapi_encode"
 aac_parser_select="adts_header mpeg4audio"
 av1_parser_select="cbs_av1"
 evc_parser_select="evcparse"
+ftr_parser_select="adts_header mpeg4audio"
 h264_parser_select="golomb h264dsp h264parse h264_sei"
 hevc_parser_select="hevcparse hevc_sei"
 mpegaudio_parser_select="mpegaudioheader"
-- 
2.40.1

_______________________________________________
ffmpeg-devel mailing list
ffmpeg-devel@ffmpeg.org
https://ffmpeg.org/mailman/listinfo/ffmpeg-devel

To unsubscribe, visit link above, or email
ffmpeg-devel-request@ffmpeg.org with subject "unsubscribe".

Re: [FFmpeg-devel] [PATCH 1/3] avcodec/bsf/dts2pts: Fix shadowing

[Andreas Rheinhardt]

Andreas Rheinhardt:
> Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@outlook.com>
> ---
>  libavcodec/bsf/dts2pts.c | 4 ++--
>  1 file changed, 2 insertions(+), 2 deletions(-)
> 
> diff --git a/libavcodec/bsf/dts2pts.c b/libavcodec/bsf/dts2pts.c
> index 53a54fb1cc..ba4dc43f84 100644
> --- a/libavcodec/bsf/dts2pts.c
> +++ b/libavcodec/bsf/dts2pts.c
> @@ -269,8 +269,8 @@ static int h264_filter(AVBSFContext *ctx)
>              h264->sps.offset_for_non_ref_pic         = sps->offset_for_non_ref_pic;
>              h264->sps.offset_for_top_to_bottom_field = sps->offset_for_top_to_bottom_field;
>              h264->sps.poc_cycle_length               = sps->num_ref_frames_in_pic_order_cnt_cycle;
> -            for (int i = 0; i < h264->sps.poc_cycle_length; i++)
> -                h264->sps.offset_for_ref_frame[i] = sps->offset_for_ref_frame[i];
> +            for (int j = 0; j < h264->sps.poc_cycle_length; j++)
> +                h264->sps.offset_for_ref_frame[j] = sps->offset_for_ref_frame[j];
>  
>              h264->picture_structure = sps->frame_mbs_only_flag ? 3 :
>                                        (header->field_pic_flag ?

Will apply this patchset.

- Andreas

_______________________________________________
ffmpeg-devel mailing list
ffmpeg-devel@ffmpeg.org
https://ffmpeg.org/mailman/listinfo/ffmpeg-devel

To unsubscribe, visit link above, or email
ffmpeg-devel-request@ffmpeg.org with subject "unsubscribe".