[SCM] Amarok packaging branch, master, updated. debian/2.8.0-3-3-g1b00e5f

[Diane Trout]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/kde-extras/amarok.git;a=commitdiff;h=ee2028b

The following commit has been merged in the master branch:
commit ee2028b6f98c7f092308cd59ae647750b84c8b45
Author: Diane Trout <diane at ghic.org>
Date:   Sat Jan 9 15:48:56 2016 -0800

    Add ffmpeg-2.9.patch for FFmpeg 2.9 compatibility (Closes: #803797) Thanks: Andreas Cadhalpun for the patch.
---
 debian/changelog                |  2 +
 debian/patches/ffmpeg_2.9.patch | 87 +++++++++++++++++++++++++++++++++++++++++
 debian/patches/series           |  1 +
 3 files changed, 90 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index 7f1184f..1199985 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,8 @@
 amarok (2.8.0-4) UNRELEASED; urgency=medium
 
   * Update watch file.
+  * Add ffmpeg-2.9.patch for FFmpeg 2.9 compatibility (Closes: #803797)
+    Thanks: Andreas Cadhalpun for the patch.
 
  -- Diane Trout <diane at debian.org>  Fri, 11 Sep 2015 14:52:32 -0700
 
diff --git a/debian/patches/ffmpeg_2.9.patch b/debian/patches/ffmpeg_2.9.patch
new file mode 100644
index 0000000..1a442e7
--- /dev/null
+++ b/debian/patches/ffmpeg_2.9.patch
@@ -0,0 +1,87 @@
+Description: Replace deprecated FFmpeg API
+Author: Andreas Cadhalpun <Andreas.Cadhalpun at googlemail.com>
+Last-Update: <2015-11-02>
+
+--- amarok-2.8.0.orig/src/musicbrainz/MusicDNSAudioDecoder.cpp
++++ amarok-2.8.0/src/musicbrainz/MusicDNSAudioDecoder.cpp
+@@ -223,7 +223,7 @@ MusicDNSAudioDecoder::decode( const QStr
+             {
+                 if( !decodedFrame )
+                 {
+-                    decodedFrame = avcodec_alloc_frame();
++                    decodedFrame = av_frame_alloc();
+                     if( !decodedFrame )
+                     {
+                         warning() << "Unable to allocate enough memory to decode file.";
+@@ -231,7 +231,7 @@ MusicDNSAudioDecoder::decode( const QStr
+                         break;
+                     }
+                     else
+-                        avcodec_get_frame_defaults( decodedFrame );
++                        av_frame_unref( decodedFrame );
+                 }
+ 
+                 decoderRet = avcodec_decode_audio4( pCodecCtx, decodedFrame, &gotFrame, &avpkt );
+@@ -267,7 +267,7 @@ MusicDNSAudioDecoder::decode( const QStr
+ 
+     avcodec_close( pCodecCtx );
+     avformat_close_input( &pFormatCtx );
+-    av_free( decodedFrame );
++    av_frame_free( &decodedFrame );
+ 
+     return data->duration();
+ }
+@@ -341,7 +341,7 @@ MusicDNSAudioDecoder::decode( const QStr
+             {
+                 if( !decodedFrame )
+                 {
+-                    decodedFrame = avcodec_alloc_frame();
++                    decodedFrame = av_frame_alloc();
+                     if( !decodedFrame )
+                     {
+                         warning() << "Unable to allocate enough memory to decode file.";
+@@ -349,7 +349,7 @@ MusicDNSAudioDecoder::decode( const QStr
+                         break;
+                     }
+                     else
+-                        avcodec_get_frame_defaults( decodedFrame );
++                        av_frame_unref( decodedFrame );
+                 }
+ 
+                 decoderRet = avcodec_decode_audio4( pCodecCtx, decodedFrame, &gotFrame, &avpkt );
+@@ -385,7 +385,7 @@ MusicDNSAudioDecoder::decode( const QStr
+ 
+     avcodec_close( pCodecCtx );
+     avformat_close_input( &pFormatCtx );
+-    av_free( decodedFrame );
++    av_frame_free( &decodedFrame );
+ 
+     return data->duration();
+ }
+@@ -459,7 +459,7 @@ MusicDNSAudioDecoder::decode( const QStr
+             {
+                 if( !decodedFrame )
+                 {
+-                    decodedFrame = avcodec_alloc_frame();
++                    decodedFrame = av_frame_alloc();
+                     if( !decodedFrame )
+                     {
+                         warning() << "Unable to allocate enough memory to decode file.";
+@@ -467,7 +467,7 @@ MusicDNSAudioDecoder::decode( const QStr
+                         break;
+                     }
+                     else
+-                        avcodec_get_frame_defaults( decodedFrame );
++                        av_frame_unref( decodedFrame );
+                 }
+ 
+                 decoderRet = avcodec_decode_audio4( pCodecCtx, decodedFrame, &gotFrame, &avpkt );
+@@ -503,7 +503,7 @@ MusicDNSAudioDecoder::decode( const QStr
+ 
+     avcodec_close( pCodecCtx );
+     av_close_input_file( pFormatCtx );
+-    av_free( decodedFrame );
++    av_frame_free( &decodedFrame );
+ 
+     return data->duration();
+ }
diff --git a/debian/patches/series b/debian/patches/series
index 74320d5..5452e26 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -7,3 +7,4 @@ debian_mysqle_force_defaults_file.diff
 debian_find_mysql_fix.diff
 debian_clamz_is_runtime_dependency.diff
 valgrind_uninitialized_value
+ffmpeg_2.9.patch

-- 
Amarok packaging