[vlc-devel] commit: Fix avcodec cinepak decoding and favour it. (Laurent Aimar )

[git version control]

vlc | branch: master | Laurent Aimar <fenrir at videolan.org> | Thu Jul  3 21:18:13 2008 +0000| [0378bedc6364442b7a23bda9822a0cb6e2be3deb]

Fix avcodec cinepak decoding and favour it.

> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=0378bedc6364442b7a23bda9822a0cb6e2be3deb
---

 modules/codec/avcodec/video.c |    2 +-
 modules/codec/cinepak.c       |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/modules/codec/avcodec/video.c b/modules/codec/avcodec/video.c
index 1ba8478..17f5f34 100644
--- 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 ***** */
diff --git a/modules/codec/cinepak.c b/modules/codec/cinepak.c
index 3a41336..b7642ec 100644
--- a/modules/codec/cinepak.c
+++ b/modules/codec/cinepak.c
@@ -41,7 +41,7 @@ static void CloseDecoder( vlc_object_t * );
 
 vlc_module_begin();
     set_description( N_("Cinepak video decoder") );
-    set_capability( "decoder", 100 );
+    set_capability( "decoder", 50 );
     set_category( CAT_INPUT );
     set_subcategory( SUBCAT_INPUT_VCODEC );
     set_callbacks( OpenDecoder, CloseDecoder );