[FFmpeg-cvslog] avformat/riffenc: Also check codec tag before setting raw_pal_avi

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michael at niedermayer.cc> | Sun Feb 21 04:21:34 2016 +0100| [0910488a16217564201204e1a37ba9a9b6f92991] | committer: Michael Niedermayer

avformat/riffenc: Also check codec tag before setting raw_pal_avi

Signed-off-by: Michael Niedermayer <michael at niedermayer.cc>

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

 libavformat/riffenc.c |    1 +
 1 file changed, 1 insertion(+)

diff --git a/libavformat/riffenc.c b/libavformat/riffenc.c
index b626aaa..0d958e3 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);