projects / packages / amarok.git / blame
| Commit | Line | Data |
|---|---|---|
| c00f92c7 JR |
1 | --- amarok-2.8.0/src/musicbrainz/MusicDNSAudioDecoder.cpp~ 2013-08-14 22:22:52.000000000 +0200 |
| 2 | +++ amarok-2.8.0/src/musicbrainz/MusicDNSAudioDecoder.cpp 2016-03-21 14:51:57.751931980 +0100 | |
| 3 | @@ -223,7 +223,7 @@ | |
| 4 | { | |
| 5 | if( !decodedFrame ) | |
| 6 | { | |
| 7 | - decodedFrame = avcodec_alloc_frame(); | |
| 8 | + decodedFrame = av_frame_alloc(); | |
| 9 | if( !decodedFrame ) | |
| 10 | { | |
| 11 | warning() << "Unable to allocate enough memory to decode file."; | |
| 12 | @@ -231,7 +231,7 @@ | |
| 13 | break; | |
| 14 | } | |
| 15 | else | |
| 16 | - avcodec_get_frame_defaults( decodedFrame ); | |
| 17 | + av_frame_unref( decodedFrame ); | |
| 18 | } | |
| 19 | ||
| 20 | decoderRet = avcodec_decode_audio4( pCodecCtx, decodedFrame, &gotFrame, &avpkt ); | |
| 21 | @@ -341,7 +341,7 @@ | |
| 22 | { | |
| 23 | if( !decodedFrame ) | |
| 24 | { | |
| 25 | - decodedFrame = avcodec_alloc_frame(); | |
| 26 | + decodedFrame = av_frame_alloc(); | |
| 27 | if( !decodedFrame ) | |
| 28 | { | |
| 29 | warning() << "Unable to allocate enough memory to decode file."; | |
| 30 | @@ -349,7 +349,7 @@ | |
| 31 | break; | |
| 32 | } | |
| 33 | else | |
| 34 | - avcodec_get_frame_defaults( decodedFrame ); | |
| 35 | + av_frame_unref( decodedFrame ); | |
| 36 | } | |
| 37 | ||
| 38 | decoderRet = avcodec_decode_audio4( pCodecCtx, decodedFrame, &gotFrame, &avpkt ); | |
| 39 | @@ -459,7 +459,7 @@ | |
| 40 | { | |
| 41 | if( !decodedFrame ) | |
| 42 | { | |
| 43 | - decodedFrame = avcodec_alloc_frame(); | |
| 44 | + decodedFrame = av_frame_alloc(); | |
| 45 | if( !decodedFrame ) | |
| 46 | { | |
| 47 | warning() << "Unable to allocate enough memory to decode file."; | |
| 48 | @@ -467,7 +467,7 @@ | |
| 49 | break; | |
| 50 | } | |
| 51 | else | |
| 52 | - avcodec_get_frame_defaults( decodedFrame ); | |
| 53 | + av_frame_unref( decodedFrame ); | |
| 54 | } | |
| 55 | ||
| 56 | decoderRet = avcodec_decode_audio4( pCodecCtx, decodedFrame, &gotFrame, &avpkt ); |