aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2004-08-12 23:36:48 +0000
committerMichael Niedermayer <michaelni@gmx.at>2004-08-12 23:36:48 +0000
commit6d24231e504f71a76a8fabe87c8d7cfa826da75a (patch)
tree9e372716f706a7bc8c18d0d7fd927b4d8b65def1
parent6ba5cbc699e77cae66bb719354fa142114b64eab (diff)
downloadffmpeg-6d24231e504f71a76a8fabe87c8d7cfa826da75a.tar.gz
give the user a chance to override codec_tag
Originally committed as revision 3382 to svn://svn.ffmpeg.org/ffmpeg/trunk
-rw-r--r--libavcodec/raw.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/libavcodec/raw.c b/libavcodec/raw.c
index a8a009bad1..91aba460ba 100644
--- a/libavcodec/raw.c
+++ b/libavcodec/raw.c
@@ -151,7 +151,8 @@ static int raw_init_encoder(AVCodecContext *avctx)
avctx->coded_frame = (AVFrame *)avctx->priv_data;
avctx->coded_frame->pict_type = FF_I_TYPE;
avctx->coded_frame->key_frame = 1;
- avctx->codec_tag = findFourCC(avctx->pix_fmt);
+ if(!avctx->codec_tag)
+ avctx->codec_tag = findFourCC(avctx->pix_fmt);
return 0;
}