Message ID | AM7PR03MB666094C48A79F0AF4B17F74C8F209@AM7PR03MB6660.eurprd03.prod.outlook.com |
---|---|
State | Accepted |
Commit | b065a70afa4f89dae9f4aa84050f20c4d856af2b |
Headers | show |
Series | [FFmpeg-devel] avcodec/libxvid: Don't set AVCodecContext.codec_id | expand |
Context | Check | Description |
---|---|---|
andriy/make_armv7_RPi4 | success | Make finished |
andriy/make_fate_armv7_RPi4 | success | Make fate finished |
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 |
andriy/make_aarch64_jetson | success | Make finished |
andriy/make_fate_aarch64_jetson | success | Make fate finished |
diff --git a/libavcodec/libxvid.c b/libavcodec/libxvid.c index 7cf9d7661c..94746d0bda 100644 --- a/libavcodec/libxvid.c +++ b/libavcodec/libxvid.c @@ -657,7 +657,6 @@ static av_cold int xvid_encode_init(AVCodecContext *avctx) if (xvid_flags & AV_CODEC_FLAG_GLOBAL_HEADER) { /* In this case, we are claiming to be MPEG-4 */ x->quicktime_format = 1; - avctx->codec_id = AV_CODEC_ID_MPEG4; } else { /* We are claiming to be Xvid */ x->quicktime_format = 0;
Unnecessary since 2325bdad7b67b1c8539ef6beebb99d3247f08669 (and crazy even before then). Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@outlook.com> --- libavcodec/libxvid.c | 1 - 1 file changed, 1 deletion(-)