[amarok] /: Switch MusicDNS decoder back from avcodec_decode_audio2 to avcodec_decode_audio3.

[Sam Lade]

It's dated June 2010 - I've checked, and it's not present in Ubuntu
Lucid, which could be an issue? If it is, it should be possible to check
if LIBAVCODEC_VERSION_MAJOR < 53 (53 is the version present in git and
the version which drops avcodec_decode_audio2) and use the old version
in this case.
Irritatingly, avcodec_decode_audio3 is apparently introduced part way
though version 52 of libavcodec, which will still cause deprecation
warnings unless we work out which minor version it was added on and
check for that as well.

Sam

On 17/05/11 18:53, Lydia Pintscher wrote:
> changelog please :)
> 
> Also: Is this version bump ok? How old is 0.6?
> 
> 
> Cheers
> Lydia
> 
> 
> On Tue, May 17, 2011 at 16:01, Sergey Ivanov <123kash at gmail.com> wrote:
>> Git commit 94cafba01506085b3002454e0b4434a83d66fce5 by Sergey Ivanov.
>> Committed on 17/05/2011 at 15:58.
>> Pushed by ivanov into branch 'master'.
>>
>> Switch MusicDNS decoder back from avcodec_decode_audio2 to avcodec_decode_audio3.
>> Patch by Sam Lade <sam at sentynel.com>.
>>
>> REVIEW: 101372
>>
>> M  +1    -1    CMakeLists.txt
>> M  +1    -1    README
>> M  +2    -2    src/musicbrainz/MusicDNSAudioDecoder.cpp
>>
>> http://commits.kde.org/amarok/94cafba01506085b3002454e0b4434a83d66fce5
>>
>> diff --git a/CMakeLists.txt b/CMakeLists.txt
>> index 8b4134f..6a470d4 100644
>> --- a/CMakeLists.txt
>> +++ b/CMakeLists.txt
>> @@ -113,7 +113,7 @@ if( WITH_PLAYER )
>>     macro_bool_to_01( LIBLASTFM_FOUND HAVE_LIBLASTFM )
>>
>>     macro_optional_find_package( FFmpeg )
>> -    macro_log_feature( FFMPEG_FOUND "ffmpeg" "Libraries and tools for handling multimedia data" "http://www.ffmpeg.org/" FALSE "0.5" "" )
>> +    macro_log_feature( FFMPEG_FOUND "ffmpeg" "Libraries and tools for handling multimedia data" "http://www.ffmpeg.org/" FALSE "0.6" "" )
>>
>>     if( FFMPEG_FOUND )
>>         macro_optional_find_package(LibOFA)
>> diff --git a/README b/README
>> index 6aff466..d42db83 100644
>> --- a/README
>> +++ b/README
>> @@ -95,7 +95,7 @@ Optional
>>     * MySQL 5.0 (or newer) Server (external database support)
>>
>>     * MusicBrainz-based audio fingerprint tag lookup requires:
>> -      * FFmpeg 0.5.0 (or newer) - http://ffmpeg.org/
>> +      * FFmpeg 0.6.0 (or newer) - http://ffmpeg.org/
>>         * libavcodec & libavformat specifically
>>       * LibOFA - http://code.google.com/p/musicip-libofa/
>>
>> diff --git a/src/musicbrainz/MusicDNSAudioDecoder.cpp b/src/musicbrainz/MusicDNSAudioDecoder.cpp
>> index 6d82bb0..69e3dc9 100644
>> --- a/src/musicbrainz/MusicDNSAudioDecoder.cpp
>> +++ b/src/musicbrainz/MusicDNSAudioDecoder.cpp
>> @@ -150,7 +150,7 @@ MusicDNSAudioDecoder::run()
>>
>>         audioStream = -1;
>>         for(i = 0; i < ( int )pFormatCtx->nb_streams; i++ )
>> -            if( pFormatCtx->streams[i]->codec->codec_type == CODEC_TYPE_AUDIO )
>> +            if( pFormatCtx->streams[i]->codec->codec_type == AVMEDIA_TYPE_AUDIO )
>>             {
>>                 audioStream = i;
>>                 break;
>> @@ -198,7 +198,7 @@ MusicDNSAudioDecoder::run()
>>                     }
>>
>>                     outSize = bufferSize;
>> -                    decoderRet = avcodec_decode_audio2( pCodecCtx, ( qint16 * )buffer, &outSize, tmpPacket.data, tmpPacket.size );
>> +                    decoderRet = avcodec_decode_audio3( pCodecCtx, ( qint16 * )buffer, &outSize, &tmpPacket );
>>                     if( decoderRet < 0 )
>>                     {
>>                         debug() << "Error while decoding.";
>>
> 
> 
>