| Message ID | AM7PR03MB66602E44B06DF346817CE4B48F7B9@AM7PR03MB6660.eurprd03.prod.outlook.com |
|---|---|
| State | Accepted |
| Commit | 155dcfe2e20b5a934310dd7561383b2c978c382d |
| Headers | show |
| Series | [FFmpeg-devel,1/2] avcodec/libx264: Don't unnecessarily add in-band extradata | expand |
| Context | Check | Description |
|---|---|---|
| andriy/make_x86 | success | Make finished |
| andriy/make_fate_x86 | success | Make fate finished |
| andriy/make_ppc | success | Make finished |
| andriy/make_fate_ppc | success | Make fate finished |
On Mon, Dec 20, 2021 at 07:22:56PM +0100, Andreas Rheinhardt wrote: > The check here is meant to check for whether avcintra-class option > (default value -1) has been set; yet it checks for the x264_param_t > value where 0 is the default value (treated as "no avcintra-mode" > by x264). This meant that in-band extradata has been added unnecessarily > when using global headers; furthermore, the first output packet > had two x264 SEIs. > > Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@outlook.com> > --- > This would have been found ages ago if we could test external > components. > > libavcodec/libx264.c | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/libavcodec/libx264.c b/libavcodec/libx264.c > index 5f62c7b1d8..2b680abf21 100644 > --- a/libavcodec/libx264.c > +++ b/libavcodec/libx264.c > @@ -944,7 +944,7 @@ static av_cold int X264_init(AVCodecContext *avctx) > > #if X264_BUILD >= 142 > /* Separate headers not supported in AVC-Intra mode */ > - if (x4->params.i_avcintra_class >= 0) > + if (x4->avcintra_class >= 0) > x4->params.b_repeat_headers = 1; > #endif > > -- > 2.32.0 good catch, LGTM, thanks. > > _______________________________________________ > 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".
diff --git a/libavcodec/libx264.c b/libavcodec/libx264.c index 5f62c7b1d8..2b680abf21 100644 --- a/libavcodec/libx264.c +++ b/libavcodec/libx264.c @@ -944,7 +944,7 @@ static av_cold int X264_init(AVCodecContext *avctx) #if X264_BUILD >= 142 /* Separate headers not supported in AVC-Intra mode */ - if (x4->params.i_avcintra_class >= 0) + if (x4->avcintra_class >= 0) x4->params.b_repeat_headers = 1; #endif
The check here is meant to check for whether avcintra-class option (default value -1) has been set; yet it checks for the x264_param_t value where 0 is the default value (treated as "no avcintra-mode" by x264). This meant that in-band extradata has been added unnecessarily when using global headers; furthermore, the first output packet had two x264 SEIs. Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@outlook.com> --- This would have been found ages ago if we could test external components. libavcodec/libx264.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)