aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAstroFloyd <AstroFloyd@gmail.com>2018-01-12 08:12:06 +0100
committerAstroFloyd <AstroFloyd@gmail.com>2018-01-12 08:12:06 +0100
commit1cada4cd0549a53f3c009e6d0562ff0cef76ebd4 (patch)
tree4ae037b0771e32fe51673f33681760e2cbaa95aa /media-sound/amarok/files/amarok-2.8.90-ffmpeg3.patch
parentsys-cluster/opencoarrays: add dependency virtual/mpi (diff)
downloadAstroFloyd-1cada4cd0549a53f3c009e6d0562ff0cef76ebd4.tar.gz
AstroFloyd-1cada4cd0549a53f3c009e6d0562ff0cef76ebd4.tar.bz2
AstroFloyd-1cada4cd0549a53f3c009e6d0562ff0cef76ebd4.zip
media-sound/amarok (+3 deps): copy from portage to keep until Plasma-5 version of Amarok is released
Package-Manager: Portage-2.3.13, Repoman-2.3.3
Diffstat (limited to 'media-sound/amarok/files/amarok-2.8.90-ffmpeg3.patch')
-rw-r--r--media-sound/amarok/files/amarok-2.8.90-ffmpeg3.patch60
1 files changed, 60 insertions, 0 deletions
diff --git a/media-sound/amarok/files/amarok-2.8.90-ffmpeg3.patch b/media-sound/amarok/files/amarok-2.8.90-ffmpeg3.patch
new file mode 100644
index 0000000..31feca0
--- /dev/null
+++ b/media-sound/amarok/files/amarok-2.8.90-ffmpeg3.patch
@@ -0,0 +1,60 @@
+https://git.reviewboard.kde.org/r/129626
+
+Index: amarok-2.8.90/src/musicbrainz/MusicDNSAudioDecoder.cpp
+===================================================================
+--- amarok-2.8.90.orig/src/musicbrainz/MusicDNSAudioDecoder.cpp
++++ amarok-2.8.90/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 );
+@@ -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 );
+@@ -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 );