Commit 7c4b1eb9 authored by Jean-Baptiste Kempf's avatar Jean-Baptiste Kempf

Remove all subtitles support for people with old avcodec versions.

parent 152870ac
...@@ -280,11 +280,13 @@ static int OpenDecoder( vlc_object_t *p_this ) ...@@ -280,11 +280,13 @@ static int OpenDecoder( vlc_object_t *p_this )
i_result = InitAudioDec ( p_dec, p_context, p_codec, i_result = InitAudioDec ( p_dec, p_context, p_codec,
i_codec_id, psz_namecodec ); i_codec_id, psz_namecodec );
break; break;
#if LIBAVCODEC_VERSION_INT >= AV_VERSION_INT( 52, 25, 0 )
case SPU_ES: case SPU_ES:
p_dec->pf_decode_sub = DecodeSubtitle; p_dec->pf_decode_sub = DecodeSubtitle;
i_result = InitSubtitleDec( p_dec, p_context, p_codec, i_result = InitSubtitleDec( p_dec, p_context, p_codec,
i_codec_id, psz_namecodec ); i_codec_id, psz_namecodec );
break; break;
#endif
default: default:
i_result = VLC_EGENERIC; i_result = VLC_EGENERIC;
} }
......
...@@ -48,6 +48,8 @@ ...@@ -48,6 +48,8 @@
#include "avcodec.h" #include "avcodec.h"
#if LIBAVCODEC_VERSION_INT >= AV_VERSION_INT( 52, 25, 0 )
struct decoder_sys_t { struct decoder_sys_t {
FFMPEG_COMMON_MEMBERS FFMPEG_COMMON_MEMBERS
}; };
...@@ -100,7 +102,6 @@ int InitSubtitleDec(decoder_t *dec, AVCodecContext *context, ...@@ -100,7 +102,6 @@ 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)
...@@ -164,11 +165,6 @@ subpicture_t *DecodeSubtitle(decoder_t *dec, block_t **block_ptr) ...@@ -164,11 +165,6 @@ 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
VLC_UNUSED(dec);
VLC_UNUSED(block_ptr);
return NULL;
#endif
} }
/** /**
...@@ -278,3 +274,4 @@ static subpicture_t *ConvertSubtitle(decoder_t *dec, AVSubtitle *ffsub, mtime_t ...@@ -278,3 +274,4 @@ static subpicture_t *ConvertSubtitle(decoder_t *dec, AVSubtitle *ffsub, mtime_t
return spu; return spu;
} }
#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