[FFmpeg-cvslog] avcodec/libxvid: Don't set AVCodecContext.codec_id

[Andreas Rheinhardt]

ffmpeg | branch: master | Andreas Rheinhardt <andreas.rheinhardt at outlook.com> | Thu Jan 27 00:11:08 2022 +0100| [b065a70afa4f89dae9f4aa84050f20c4d856af2b] | committer: Andreas Rheinhardt

avcodec/libxvid: Don't set AVCodecContext.codec_id

Unnecessary since 2325bdad7b67b1c8539ef6beebb99d3247f08669
(and crazy even before then).

Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt at outlook.com>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=b065a70afa4f89dae9f4aa84050f20c4d856af2b
---

 libavcodec/libxvid.c | 1 -
 1 file changed, 1 deletion(-)

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;