]>
Commit | Line | Data |
---|---|---|
9cda017b | 1 | --- amarok-2.4.1/src/musicbrainz/MusicDNSAudioDecoder.cpp~ 2011-05-05 21:06:53.000000000 +0200 |
2 | +++ amarok-2.4.1/src/musicbrainz/MusicDNSAudioDecoder.cpp 2011-07-01 14:57:41.811795115 +0200 | |
3 | @@ -150,7 +150,7 @@ | |
4 | ||
5 | audioStream = -1; | |
6 | for(i = 0; i < ( int )pFormatCtx->nb_streams; i++ ) | |
7 | - if( pFormatCtx->streams[i]->codec->codec_type == CODEC_TYPE_AUDIO ) | |
b549e5ae | 8 | + if( pFormatCtx->streams[i]->codec->codec_type == AVMEDIA_TYPE_AUDIO ) |
9cda017b | 9 | { |
10 | audioStream = i; | |
11 | break; | |
b549e5ae | 12 | @@ -198,7 +198,7 @@ |
13 | } | |
14 | ||
15 | outSize = bufferSize; | |
16 | - decoderRet = avcodec_decode_audio2( pCodecCtx, ( qint16 * )buffer, &outSize, tmpPacket.data, tmpPacket.size ); | |
17 | + decoderRet = avcodec_decode_audio( pCodecCtx, ( qint16 * )buffer, &outSize, &tmpPacket ); | |
18 | if( decoderRet < 0 ) | |
19 | { | |
20 | debug() << "Error while decoding."; | |
9cda017b | 21 | @@ -252,4 +252,4 @@ |
22 | } | |
23 | ||
24 | ||
25 | -#include "MusicDNSAudioDecoder.moc" | |
26 | \ Brak znaku nowej linii na końcu pliku | |
27 | +#include "MusicDNSAudioDecoder.moc" |