Fix avcodec cinepak decoding and favour it.

[vlc] / modules / codec / avcodec / video.c

diff --git a/modules/codec/avcodec/video.c b/modules/codec/avcodec/video.c
index 1ba84781832d5582ab313026b8f1666bff788f45..17f5f34ece3a3333f72df220b43175d7be3e44da 100644 (file)
--- a/modules/codec/avcodec/video.c
+++ b/modules/codec/avcodec/video.c
@@ -387,7 +387,7 @@ int InitVideoDec( decoder_t *p_dec, AVCodecContext *p_context,
     if( p_dec->fmt_in.video.p_palette )
         p_sys->p_context->palctrl =
             (AVPaletteControl *)p_dec->fmt_in.video.p_palette;
-    else if( p_sys->i_codec_id != CODEC_ID_MSVIDEO1 )
+    else if( p_sys->i_codec_id != CODEC_ID_MSVIDEO1 && p_sys->i_codec_id != CODEC_ID_CINEPAK )
         p_sys->p_context->palctrl = &palette_control;
 
     /* ***** Open the codec ***** */