- rel 9; fix ffmpeg 2.4 build

diff --git a/k3b-2.0.2-ffmpeg.patch b/k3b-2.0.2-ffmpeg.patch
index 2878b1edcb06ed44050a4172c0fc61b5cc2d318d..4dc85f1099b2ea7a7e0a645de80a37c9a62dd4ec 100644 (file)
--- 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;
+     }
+ }

diff --git a/k3b.spec b/k3b.spec
index 316b2bfa203053d08aa99eb20beff75e8155c10e..e1299be0e58b0f05aca7c57cac42c659a4653384 100644 (file)
--- 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