From owner-svn-ports-head@FreeBSD.ORG  Mon Oct 28 14:57:31 2013
Return-Path: <owner-svn-ports-head@FreeBSD.ORG>
Delivered-To: svn-ports-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTP id 523EC7B9;
 Mon, 28 Oct 2013 14:57:31 +0000 (UTC) (envelope-from wg@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (No client certificate requested)
 by mx1.freebsd.org (Postfix) with ESMTPS id 3FB9824EE;
 Mon, 28 Oct 2013 14:57:31 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r9SEvVQP099031;
 Mon, 28 Oct 2013 14:57:31 GMT (envelope-from wg@svn.freebsd.org)
Received: (from wg@localhost)
 by svn.freebsd.org (8.14.7/8.14.5/Submit) id r9SEvVUZ099030;
 Mon, 28 Oct 2013 14:57:31 GMT (envelope-from wg@svn.freebsd.org)
Message-Id: <201310281457.r9SEvVUZ099030@svn.freebsd.org>
From: William Grzybowski <wg@FreeBSD.org>
Date: Mon, 28 Oct 2013 14:57:31 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r331862 - head/multimedia/2mandvd/files
X-SVN-Group: ports-head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-ports-head@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: SVN commit messages for the ports tree for head
 <svn-ports-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-ports-head>,
 <mailto:svn-ports-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-ports-head>
List-Post: <mailto:svn-ports-head@freebsd.org>
List-Help: <mailto:svn-ports-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-ports-head>,
 <mailto:svn-ports-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 28 Oct 2013 14:57:31 -0000

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;