[vlc-devel] commit: avcodec: fix compilation. ( Rémi Duraffort )

git version control git at videolan.org
Fri Aug 28 12:40:08 CEST 2009


vlc | branch: master | Rémi Duraffort <ivoire at videolan.org> | Fri Aug 28 12:39:55 2009 +0200| [59fbc36bd81f54f04c267eeadf9902cbfbe9e35b] | committer: Rémi Duraffort 

avcodec: fix compilation.

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

 modules/codec/avcodec/avcodec.c |    9 +++++----
 1 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/modules/codec/avcodec/avcodec.c b/modules/codec/avcodec/avcodec.c
index ca6c75f..6b38a78 100644
--- a/modules/codec/avcodec/avcodec.c
+++ b/modules/codec/avcodec/avcodec.c
@@ -44,16 +44,15 @@
 #   include <avcodec.h>
 #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 )




More information about the vlc-devel mailing list