| Message ID | HE1PR0301MB21548593D07EDB2B310DC27F8F539@HE1PR0301MB2154.eurprd03.prod.outlook.com |
|---|---|
| State | New |
| Headers | show |
| Series | [FFmpeg-devel] avcodec/libxavs: Always use in-band headers | expand |
| Context | Check | Description |
|---|---|---|
| andriy/x86_make | success | Make finished |
| andriy/x86_make_fate | fail | Make fate failed |
| andriy/PPC64_make | success | Make finished |
| andriy/PPC64_make_fate | warning | Make fate failed |
On 5/10/2021 10:52 PM, Andreas Rheinhardt wrote: > The code to create global headers is broken and deactivated, > so one must not deactivate in-band headers even if the > AV_CODEC_FLAG_GLOBAL_HEADER is set; doing otherwise creates > unplayable files when this flag is set. > > Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@outlook.com> > --- > libavcodec/libxavs.c | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/libavcodec/libxavs.c b/libavcodec/libxavs.c > index 253f4bde6a..01ee8b4187 100644 > --- a/libavcodec/libxavs.c > +++ b/libavcodec/libxavs.c > @@ -335,7 +335,7 @@ static av_cold int XAVS_init(AVCodecContext *avctx) > x4->params.i_threads = avctx->thread_count; > x4->params.b_interlaced = avctx->flags & AV_CODEC_FLAG_INTERLACED_DCT; > > - if (avctx->flags & AV_CODEC_FLAG_GLOBAL_HEADER) > + if (avctx->flags & AV_CODEC_FLAG_GLOBAL_HEADER && 0) > x4->params.b_repeat_headers = 0; Disabling code like this is not ok. You can delete these two lines. The git history exists for a reason. > > x4->enc = xavs_encoder_open(&x4->params); >
diff --git a/libavcodec/libxavs.c b/libavcodec/libxavs.c index 253f4bde6a..01ee8b4187 100644 --- a/libavcodec/libxavs.c +++ b/libavcodec/libxavs.c @@ -335,7 +335,7 @@ static av_cold int XAVS_init(AVCodecContext *avctx) x4->params.i_threads = avctx->thread_count; x4->params.b_interlaced = avctx->flags & AV_CODEC_FLAG_INTERLACED_DCT; - if (avctx->flags & AV_CODEC_FLAG_GLOBAL_HEADER) + if (avctx->flags & AV_CODEC_FLAG_GLOBAL_HEADER && 0) x4->params.b_repeat_headers = 0; x4->enc = xavs_encoder_open(&x4->params);
The code to create global headers is broken and deactivated, so one must not deactivate in-band headers even if the AV_CODEC_FLAG_GLOBAL_HEADER is set; doing otherwise creates unplayable files when this flag is set. Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@outlook.com> --- libavcodec/libxavs.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)