Skip to content

V
vlc-2-2
Commit 0378bedc authored by Laurent Aimar's avatar Laurent Aimar
Browse files
Options

Fix avcodec cinepak decoding and favour it.

parent 1750723d
Show whitespace changes
Inline Side-by-side
Showing with 2 additions and 2 deletions
modules/codec/avcodec/video.c
View file @ 0378bedc
...@@ -387,7 +387,7 @@ int InitVideoDec( decoder_t *p_dec, AVCodecContext *p_context, ...@@ -387,7 +387,7 @@ int InitVideoDec( decoder_t *p_dec, AVCodecContext *p_context,
if( p_dec->fmt_in.video.p_palette ) if( p_dec->fmt_in.video.p_palette )
p_sys->p_context->palctrl = p_sys->p_context->palctrl =
(AVPaletteControl *)p_dec->fmt_in.video.p_palette; (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; p_sys->p_context->palctrl = &palette_control;
/* ***** Open the codec ***** */ /* ***** Open the codec ***** */
......
modules/codec/cinepak.c
View file @ 0378bedc
...@@ -41,7 +41,7 @@ static void CloseDecoder( vlc_object_t * ); ...@@ -41,7 +41,7 @@ static void CloseDecoder( vlc_object_t * );
vlc_module_begin(); vlc_module_begin();
set_description( N_("Cinepak video decoder") ); set_description( N_("Cinepak video decoder") );
set_capability( "decoder", 100 ); set_capability( "decoder", 50 );
set_category( CAT_INPUT ); set_category( CAT_INPUT );
set_subcategory( SUBCAT_INPUT_VCODEC ); set_subcategory( SUBCAT_INPUT_VCODEC );
set_callbacks( OpenDecoder, CloseDecoder ); set_callbacks( OpenDecoder, CloseDecoder );
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment