diff options
| author | Ramiro Polla <ramiro@lisha.ufsc.br> | 2006-10-15 16:52:33 +0000 |
|---|---|---|
| committer | Guillaume Poirier <gpoirier@mplayerhq.hu> | 2006-10-15 16:52:33 +0000 |
| commit | aa770811a3dd07f0a6adc65d4d9cfbe9fad812ee (patch) | |
| tree | c60a26f0af891631b7381e70c32232303c152f1b /libavcodec | |
| parent | 14f29f795d6b1a8a7d864ff97d6302bfe6fb0ba9 (diff) | |
| download | ffmpeg-aa770811a3dd07f0a6adc65d4d9cfbe9fad812ee.tar.gz | |
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
Diffstat (limited to 'libavcodec')
| -rw-r--r-- | libavcodec/xvidff.c | 3 |
1 files changed, 2 insertions, 1 deletions
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 */ |