From aa770811a3dd07f0a6adc65d4d9cfbe9fad812ee Mon Sep 17 00:00:00 2001 From: Ramiro Polla Date: Sun, 15 Oct 2006 16:52:33 +0000 Subject: [PATCH] Have xvid encoder wrapper honnor -vtag option Patch by Ramiro Polla angustia A arrozcru P no-ip P org Original thread: Date: 14.10.2006 05:44 Subject: [Ffmpeg-devel] xvid ignores -vtag Originally committed as revision 6701 to svn://svn.ffmpeg.org/ffmpeg/trunk --- libavcodec/xvidff.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/libavcodec/xvidff.c b/libavcodec/xvidff.c index e48bfe558d..590fe4b308 100644 --- a/libavcodec/xvidff.c +++ b/libavcodec/xvidff.c @@ -335,7 +335,8 @@ int ff_xvid_encode_init(AVCodecContext *avctx) { } else { /* We are claiming to be XviD */ x->quicktime_format = 0; - avctx->codec_tag = ff_get_fourcc("xvid"); + if(!avctx->codec_tag) + avctx->codec_tag = ff_get_fourcc("xvid"); } /* Bframes */