Date: Mon, 28 Oct 2013 14:57:31 +0000 (UTC) From: William Grzybowski <wg@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r331862 - head/multimedia/2mandvd/files Message-ID: <201310281457.r9SEvVUZ099030@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: wg Date: Mon Oct 28 14:57:30 2013 New Revision: 331862 URL: http://svnweb.freebsd.org/changeset/ports/331862 Log: multimedia/2mandvd: fix build with newer ffmpeg - Add patch to chase the ffmpeg 2.0 API change Reported by: marino Modified: head/multimedia/2mandvd/files/patch-videowrapper.cpp Modified: head/multimedia/2mandvd/files/patch-videowrapper.cpp ============================================================================== --- head/multimedia/2mandvd/files/patch-videowrapper.cpp Mon Oct 28 14:53:49 2013 (r331861) +++ head/multimedia/2mandvd/files/patch-videowrapper.cpp Mon Oct 28 14:57:30 2013 (r331862) @@ -1,11 +1,21 @@ ---- videowrapper.cpp.orig -+++ videowrapper.cpp -@@ -38,7 +38,7 @@ void videowrapper::delete_videowrapper() +diff -urN videowrapper.cpp videowrapper.cpp +--- videowrapper.cpp 2012-06-06 20:25:24.000000000 +1100 ++++ videowrapper.cpp 2013-08-03 10:54:05.426228163 +1100 +@@ -38,7 +38,7 @@ 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 LIBAVFORMAT_VERSION_MAJOR >= 53 if (avformat_open_input(&pFormatCtx,filename.toAscii().data(),NULL,NULL)!=0) { #else +@@ -90,7 +90,7 @@ + + // *** OUVERTURE DU CODEC *** + +- if(avcodec_open(pCodecCtx, pCodec)<0) ++ if(avcodec_open2(pCodecCtx, pCodec, NULL)<0) + { + qDebug() << "CAN'T FIND VIDEO CODEC"; + return 1;
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201310281457.r9SEvVUZ099030>