Sophie

Sophie

distrib > Mandriva > current > i586 > media > contrib-release-src > by-pkgid > ae59112a30001eabd903cc2e23296630 > files > 5

xbmc-9.11-1.svn29467.pvr_testing2.1mdv2010.1.src.rpm

diff -N'urpax*~' -x'*.orig' -x'*.rej' xbmc-pvr-testing2-29467/xbmc/cores/dvdplayer/DVDCodecs/Video/VAAPI.cpp xbmc-pvr-testing2-29467-vaapi-old-ffmpeg/xbmc/cores/dvdplayer/DVDCodecs/Video/VAAPI.cpp
--- xbmc-pvr-testing2-29467/xbmc/cores/dvdplayer/DVDCodecs/Video/VAAPI.cpp	2010-04-24 05:06:25.000000000 +0300
+++ xbmc-pvr-testing2-29467-vaapi-old-ffmpeg/xbmc/cores/dvdplayer/DVDCodecs/Video/VAAPI.cpp	2010-04-24 23:00:52.667389666 +0300
@@ -234,12 +234,17 @@ bool CDecoder::Open(AVCodecContext *avct
       break;
     case CODEC_ID_H264:
     {
+#ifdef FF_PROFILE_H264_BASELINE
       if  (avctx->profile == FF_PROFILE_H264_BASELINE)
         accepted.push_back(VAProfileH264Baseline);
       else
       {
         if(avctx->profile == FF_PROFILE_H264_MAIN)
           accepted.push_back(VAProfileH264Main); 
+#else
+        // fallback to high profile if libavcodec is too old to export
+      { // profile information
+#endif
         // fallback to high profile if main profile is not available
         accepted.push_back(VAProfileH264High);
       }