Skip to content

V
vlc
Commit 5082bfea authored by Jean-Baptiste Kempf's avatar Jean-Baptiste Kempf
Browse files
Options

Fix subtitle commit for old versions of avcodec.

parent ea2b0c8b
Show whitespace changes
Inline Side-by-side
Showing with 4 additions and 0 deletions
modules/codec/avcodec/subtitle.c
View file @ 5082bfea
...@@ -100,6 +100,7 @@ int InitSubtitleDec(decoder_t *dec, AVCodecContext *context, ...@@ -100,6 +100,7 @@ int InitSubtitleDec(decoder_t *dec, AVCodecContext *context,
*/ */
subpicture_t *DecodeSubtitle(decoder_t *dec, block_t **block_ptr) subpicture_t *DecodeSubtitle(decoder_t *dec, block_t **block_ptr)
{ {
#if LIBAVCODEC_VERSION_INT >= AV_VERSION_INT( 52, 25, 0 )
decoder_sys_t *sys = dec->p_sys; decoder_sys_t *sys = dec->p_sys;
if (!block_ptr || !*block_ptr) if (!block_ptr || !*block_ptr)
...@@ -163,6 +164,9 @@ subpicture_t *DecodeSubtitle(decoder_t *dec, block_t **block_ptr) ...@@ -163,6 +164,9 @@ subpicture_t *DecodeSubtitle(decoder_t *dec, block_t **block_ptr)
if (!spu) if (!spu)
block_Release(block); block_Release(block);
return spu; return spu;
#else
return NULL;
#endif
} }
/** /**
......
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