[packages/k3b] - rel 9; fix ffmpeg 2.4 build
arekm
arekm at pld-linux.org
Wed Oct 8 09:26:43 CEST 2014
commit 603f95fcd6986d24c6722b078edc7fd6c39240aa
Author: Arkadiusz Miśkiewicz <arekm at maven.pl>
Date: Wed Oct 8 09:26:40 2014 +0200
- rel 9; fix ffmpeg 2.4 build
k3b-2.0.2-ffmpeg.patch | 20 ++++++++++++++++++++
k3b.spec | 2 +-
2 files changed, 21 insertions(+), 1 deletion(-)
---
diff --git a/k3b.spec b/k3b.spec
index 316b2bf..e1299be 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: 8
+Release: 9
Epoch: 1
License: GPL v2+
Group: X11/Libraries
diff --git a/k3b-2.0.2-ffmpeg.patch b/k3b-2.0.2-ffmpeg.patch
index 2878b1e..4dc85f1 100644
--- a/k3b-2.0.2-ffmpeg.patch
+++ b/k3b-2.0.2-ffmpeg.patch
@@ -94,3 +94,23 @@ index 0ad59fc..0c5f366 100644
if( d->packetSize <= 0 || len < 0 )
::av_free_packet( &d->packet );
+--- k3b-2.0.2/plugins/decoder/ffmpeg/k3bffmpegwrapper.cpp.org 2014-10-08 09:20:42.493085826 +0200
++++ k3b-2.0.2/plugins/decoder/ffmpeg/k3bffmpegwrapper.cpp 2014-10-08 09:22:45.357371074 +0200
+@@ -95,7 +95,7 @@
+ }
+
+ // analyze the streams
+- ::av_find_stream_info( d->formatContext );
++ ::avformat_find_stream_info( d->formatContext, NULL );
+
+ // we only handle files containing one audio stream
+ if( d->formatContext->nb_streams != 1 ) {
+@@ -165,7 +165,7 @@
+ }
+
+ if( d->formatContext ) {
+- ::av_close_input_file( d->formatContext );
++ ::avformat_close_input( &d->formatContext );
+ d->formatContext = 0;
+ }
+ }
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/k3b.git/commitdiff/603f95fcd6986d24c6722b078edc7fd6c39240aa
More information about the pld-cvs-commit
mailing list