From 5535be8635d3f74ccc774ee28e0804d7aaeeec41 Mon Sep 17 00:00:00 2001
From: Alexis BALLIER <aballier@gentoo.org>
Date: Sun, 12 Feb 2017 17:42:50 +0100
Subject: [PATCH 38/47] Fix amarok build with LibOFA using ffmpeg 3+

Testing Done:
https://bugs.gentoo.org/show_bug.cgi?id=601800

REVIEW: 129626
---
 src/musicbrainz/MusicDNSAudioDecoder.cpp | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/musicbrainz/MusicDNSAudioDecoder.cpp b/src/musicbrainz/MusicDNSAudioDecoder.cpp
index ea39a1b..43767d5 100644
--- a/src/musicbrainz/MusicDNSAudioDecoder.cpp
+++ b/src/musicbrainz/MusicDNSAudioDecoder.cpp
@@ -223,7 +223,7 @@ MusicDNSAudioDecoder::decode( const QString &fileName, DecodedAudioData *data, c
             {
                 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 QString &fileName, DecodedAudioData *data, c
                         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 QString &fileName, DecodedAudioData *data, c
             {
                 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 QString &fileName, DecodedAudioData *data, c
                         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 QString &fileName, DecodedAudioData *data, c
             {
                 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 QString &fileName, DecodedAudioData *data, c
                         break;
                     }
                     else
-                        avcodec_get_frame_defaults( decodedFrame );
+		         av_frame_unref( decodedFrame );
                 }
 
                 decoderRet = avcodec_decode_audio4( pCodecCtx, decodedFrame, &gotFrame, &avpkt );
-- 
2.9.3