aboutsummaryrefslogtreecommitdiffstats
path: root/libavformat/riffenc.c
diff options
context:
space:
mode:
authorMichael Niedermayer <michael@niedermayer.cc>2016-02-21 04:21:34 +0100
committerMichael Niedermayer <michael@niedermayer.cc>2016-02-21 13:08:21 +0100
commit0910488a16217564201204e1a37ba9a9b6f92991 (patch)
treee71a331e75259a168aa7f4b32d67149f93ea50b8 /libavformat/riffenc.c
parenta2f8beef2dfaee573f7c4a607afaa9e83fc2c1e0 (diff)
downloadffmpeg-0910488a16217564201204e1a37ba9a9b6f92991.tar.gz
avformat/riffenc: Also check codec tag before setting raw_pal_avi
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
Diffstat (limited to 'libavformat/riffenc.c')
-rw-r--r--libavformat/riffenc.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/libavformat/riffenc.c b/libavformat/riffenc.c
index b626aaa0a1..0d958e312f 100644
--- a/libavformat/riffenc.c
+++ b/libavformat/riffenc.c
@@ -212,6 +212,7 @@ void ff_put_bmp_header(AVIOContext *pb, AVCodecContext *enc,
int raw_pal_avi;
raw_pal_avi = !for_asf && enc->codec_id == AV_CODEC_ID_RAWVIDEO &&
+ !enc->codec_tag &&
enc->bits_per_coded_sample >= 1 && enc->bits_per_coded_sample <= 8;
if (!enc->extradata_size && raw_pal_avi)
extradata_size = 4 * (1 << enc->bits_per_coded_sample);