summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--app-cdr/k3b/files/k3b-2.0.2-libavformat54.patch22
-rw-r--r--app-cdr/k3b/k3b-9999.ebuild3
2 files changed, 23 insertions, 2 deletions
diff --git a/app-cdr/k3b/files/k3b-2.0.2-libavformat54.patch b/app-cdr/k3b/files/k3b-2.0.2-libavformat54.patch
new file mode 100644
index 00000000000..174a776b8b9
--- /dev/null
+++ b/app-cdr/k3b/files/k3b-2.0.2-libavformat54.patch
@@ -0,0 +1,22 @@
+Index: k3b-2.0.2/plugins/decoder/ffmpeg/k3bffmpegwrapper.cpp
+===================================================================
+--- k3b-2.0.2.orig/plugins/decoder/ffmpeg/k3bffmpegwrapper.cpp
++++ k3b-2.0.2/plugins/decoder/ffmpeg/k3bffmpegwrapper.cpp
+@@ -88,7 +88,7 @@ bool K3bFFMpegFile::open()
+ close();
+
+ // open the file
+- int err = ::av_open_input_file( &d->formatContext, m_filename.toLocal8Bit(), 0, 0, 0 );
++ int err = ::avformat_open_input( &d->formatContext, m_filename.toLocal8Bit(), 0, NULL);
+ if( err < 0 ) {
+ kDebug() << "(K3bFFMpegFile) unable to open " << m_filename << " with error " << err;
+ return false;
+@@ -143,7 +143,7 @@ bool K3bFFMpegFile::open()
+ }
+
+ // dump some debugging info
+- ::dump_format( d->formatContext, 0, m_filename.toLocal8Bit(), 0 );
++ ::av_dump_format( d->formatContext, 0, m_filename.toLocal8Bit(), 0 );
+
+ return true;
+ }
diff --git a/app-cdr/k3b/k3b-9999.ebuild b/app-cdr/k3b/k3b-9999.ebuild
index ceae714c776..6bccd1d9f1a 100644
--- a/app-cdr/k3b/k3b-9999.ebuild
+++ b/app-cdr/k3b/k3b-9999.ebuild
@@ -62,8 +62,7 @@ RDEPEND="${DEPEND}
DOCS+=( ChangeLog )
PATCHES=(
- "${FILESDIR}/${P}-ffmpeg.patch"
- "${FILESDIR}/${P}-libavformat54.patch"
+ "${FILESDIR}/${PN}-2.0.2-libavformat54.patch"
)
src_configure() {