[packages/k3b] - fix build with ffmpeg2 - rel 7

[baggins]

commit 15883a70f8d36dd50805839732777aca0bf64db4
Author: Jan Rękorajski <baggins at pld-linux.org>
Date:   Thu Aug 29 21:20:17 2013 +0200

    - fix build with ffmpeg2
    - rel 7

 ffmpeg2.patch | 24 ++++++++++++++++++++++++
 k3b.spec      |  4 +++-
 2 files changed, 27 insertions(+), 1 deletion(-)
---
diff --git a/k3b.spec b/k3b.spec
index 4c529dd..bb63cad 100644
--- a/k3b.spec
+++ b/k3b.spec
@@ -14,7 +14,7 @@ Summary(hu.UTF-8):	CD Kreator
 Summary(pl.UTF-8):	Kreator CD
 Name:		k3b
 Version:	2.0.2
-Release:	6
+Release:	7
 Epoch:		1
 License:	GPL v2+
 Group:		X11/Libraries
@@ -22,6 +22,7 @@ Source0:	http://downloads.sourceforge.net/k3b/%{name}-%{version}.tar.bz2
 # Source0-md5:	c86113af31a2032e57fd2f302b5f637a
 Patch0:		k3b-2.0.2-ffmpeg.patch
 Patch1:		k3b-2.0.2-libavformat54.patch
+Patch2:		ffmpeg2.patch
 URL:		http://k3b.plainblack.com/
 BuildRequires:	Qt3Support-devel >= %{qtver}
 BuildRequires:	QtNetwork-devel >= %{qtver}
@@ -143,6 +144,7 @@ Pliki nagłówkowe biblioteki libk3bcore.
 %setup -q
 %patch0 -p1
 %patch1 -p1
+%patch2 -p1
 
 %build
 install -d build
diff --git a/ffmpeg2.patch b/ffmpeg2.patch
new file mode 100644
index 0000000..81115e9
--- /dev/null
+++ b/ffmpeg2.patch
@@ -0,0 +1,24 @@
+--- k3b-2.0.2/plugins/decoder/ffmpeg/k3bffmpegwrapper.h~	2011-01-15 21:47:29.000000000 +0100
++++ k3b-2.0.2/plugins/decoder/ffmpeg/k3bffmpegwrapper.h	2013-08-29 21:14:40.621518962 +0200
+@@ -18,7 +18,9 @@
+ 
+ #include "k3bmsf.h"
+ 
+-
++#ifndef AVCODEC_MAX_AUDIO_FRAME_SIZE
++#define AVCODEC_MAX_AUDIO_FRAME_SIZE 192000
++#endif
+ 
+ /**
+  * Create with K3bFFMpegWrapper::open
+--- k3b-2.0.2/plugins/decoder/ffmpeg/k3bffmpegwrapper.cpp~	2013-08-29 21:10:02.754685572 +0200
++++ k3b-2.0.2/plugins/decoder/ffmpeg/k3bffmpegwrapper.cpp	2013-08-29 21:15:11.658576297 +0200
+@@ -129,7 +129,7 @@
+ 
+     // open the codec on our context
+     kDebug() << "(K3bFFMpegFile) found codec for " << m_filename;
+-    if( ::avcodec_open( codecContext, d->codec ) < 0 ) {
++    if( ::avcodec_open2( codecContext, d->codec, NULL ) < 0 ) {
+         kDebug() << "(K3bFFMpegDecoderFactory) could not open codec.";
+         return false;
+     }
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/k3b.git/commitdiff/15883a70f8d36dd50805839732777aca0bf64db4