diff -up k3b-1.0.5/plugins/decoder/ffmpeg/k3bffmpegwrapper.cpp.lavc52 k3b-1.0.5/plugins/decoder/ffmpeg/k3bffmpegwrapper.cpp --- k3b-1.0.5/plugins/decoder/ffmpeg/k3bffmpegwrapper.cpp.lavc52 2008-12-15 20:47:09.000000000 +0100 +++ k3b-1.0.5/plugins/decoder/ffmpeg/k3bffmpegwrapper.cpp 2008-12-15 21:23:34.000000000 +0100 @@ -194,7 +194,11 @@ QString K3bFFMpegFile::typeComment() con return i18n("Windows Media v1"); case CODEC_ID_WMAV2: return i18n("Windows Media v2"); +#if LIBAVCODEC_VERSION_INT < ((52<<16)+(0<<8)+0) case CODEC_ID_MP3LAME: +#else + case CODEC_ID_MP3: +#endif return i18n("MPEG 1 Layer III"); case CODEC_ID_AAC: return i18n("Advanced Audio Coding (AAC)"); @@ -289,8 +293,10 @@ int K3bFFMpegFile::fillOutputBuffer() #ifdef FFMPEG_BUILD_PRE_4629 int len = avcodec_decode_audio( &d->formatContext->streams[0]->codec, -#else +#elif LIBAVCODEC_VERSION_INT < ((52<<16)+(0<<8)+0) int len = avcodec_decode_audio( d->formatContext->streams[0]->codec, +#else + int len = avcodec_decode_audio2( d->formatContext->streams[0]->codec, #endif (short*)d->outputBuffer, &d->outputBufferSize, d->packetData, d->packetSize );