From: RĂ©mi Duraffort Date: Fri, 28 Aug 2009 10:39:55 +0000 (+0200) Subject: avcodec: fix compilation. X-Git-Tag: 1.1.0-ff~3809 X-Git-Url: https://git.sesse.net/?a=commitdiff_plain;h=59fbc36bd81f54f04c267eeadf9902cbfbe9e35b;p=vlc avcodec: fix compilation. --- diff --git a/modules/codec/avcodec/avcodec.c b/modules/codec/avcodec/avcodec.c index ca6c75f61f..6b38a7852a 100644 --- a/modules/codec/avcodec/avcodec.c +++ b/modules/codec/avcodec/avcodec.c @@ -44,16 +44,15 @@ # include #endif +#include "avcodec.h" +#include "avutil.h" + #if LIBAVCODEC_VERSION_INT < AV_VERSION_INT( 51, 48, 0 ) # error You must update libavcodec to a version >= 51.48.0 #elif LIBAVCODEC_VERSION_INT < AV_VERSION_INT( 52, 25, 0 ) # warning You should update libavcodec to get subtitle support #endif - -#include "avcodec.h" -#include "avutil.h" - /***************************************************************************** * decoder_sys_t: decoder descriptor *****************************************************************************/ @@ -315,9 +314,11 @@ static void CloseDecoder( vlc_object_t *p_this ) case VIDEO_ES: EndVideoDec ( p_dec ); break; +#if LIBAVCODEC_VERSION_INT >= AV_VERSION_INT( 52, 25, 0 ) case SPU_ES: EndSubtitleDec( p_dec ); break; +#endif } if( p_sys->p_context )