[gentoo-commits] gentoo-x86 commit in media-video/2mandvd/files: 2mandvd-1.8.5-libavformat54.patch 2mandvd-fix-const-char-concatenation.patch

[Davide Pesavento (pesa)]

pesa        13/08/31 08:27:17

  Added:                2mandvd-1.8.5-libavformat54.patch
  Removed:              2mandvd-fix-const-char-concatenation.patch
  Log:
  Version bump.
  
  (Portage version: 2.2.1/cvs/Linux x86_64, signed Manifest commit with key 17A85C72)

Revision  Changes    Path
1.1                  media-video/2mandvd/files/2mandvd-1.8.5-libavformat54.patch

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/2mandvd/files/2mandvd-1.8.5-libavformat54.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/2mandvd/files/2mandvd-1.8.5-libavformat54.patch?rev=1.1&content-type=text/plain

Index: 2mandvd-1.8.5-libavformat54.patch
===================================================================
diff --git a/videowrapper.cpp b/videowrapper.cpp
index 7ae4ad3..d50599b 100644
--- a/videowrapper.cpp
+++ b/videowrapper.cpp
@@ -38,7 +38,7 @@ void videowrapper::delete_videowrapper()
 int videowrapper::load_video(QString filename)
 {
     // *** OUVERTURE DU FICHIER VIDEO ***
-    #ifdef avformat_open_input
+    #if LIBAVFORMAT_VERSION_INT > AV_VERSION_INT(53,5,0)
         if (avformat_open_input(&pFormatCtx,filename.toAscii().data(),NULL,NULL)!=0)
         {
     #else
@@ -91,13 +91,8 @@ int videowrapper::load_video(QString filename)
 
     // *** OUVERTURE DU CODEC ***
 
-    #ifdef av_find_stream_info
-    if(avcodec_open(pCodecCtx, pCodec)<0)
-    {
-    #else
     if (avcodec_open2(pCodecCtx, pCodec, NULL) < 0)
     {
-    #endif
         qDebug() << "CAN'T FIND VIDEO CODEC";
         return 1;
     }