diff -U3 -d -r -N k3b-1.0.5/configure k3b-1.0.5.fixed/configure --- k3b-1.0.5/configure 2008-05-27 10:34:35.000000000 +0200 +++ k3b-1.0.5.fixed/configure 2008-12-17 21:31:50.000000000 +0100 @@ -36643,8 +36643,8 @@ cat >conftest.$ac_ext <<_ACEOF extern "C" { - #include - #include + #include + #include } int main() { @@ -36684,8 +36684,8 @@ LIBS="-lavformat -lavcodec $LIBS" cat >conftest.$ac_ext <<_ACEOF extern "C" { - #include - #include + #include + #include } int main() { diff -U3 -d -r -N k3b-1.0.5/plugins/decoder/ffmpeg/k3bffmpegdecoder.cpp k3b-1.0.5.fixed/plugins/decoder/ffmpeg/k3bffmpegdecoder.cpp --- k3b-1.0.5/plugins/decoder/ffmpeg/k3bffmpegdecoder.cpp 2008-05-27 10:23:36.000000000 +0200 +++ k3b-1.0.5.fixed/plugins/decoder/ffmpeg/k3bffmpegdecoder.cpp 2008-12-17 21:44:05.000000000 +0100 @@ -22,7 +22,7 @@ #include extern "C" { -#include +#include } #include diff -U3 -d -r -N k3b-1.0.5/plugins/decoder/ffmpeg/k3bffmpegwrapper.cpp k3b-1.0.5.fixed/plugins/decoder/ffmpeg/k3bffmpegwrapper.cpp --- k3b-1.0.5/plugins/decoder/ffmpeg/k3bffmpegwrapper.cpp 2008-05-27 10:23:36.000000000 +0200 +++ k3b-1.0.5.fixed/plugins/decoder/ffmpeg/k3bffmpegwrapper.cpp 2008-12-18 06:20:41.000000000 +0100 @@ -18,8 +18,8 @@ #include "k3bffmpegwrapper.h" extern "C" { -#include -#include +#include +#include } #include @@ -194,7 +194,7 @@ return i18n("Windows Media v1"); case CODEC_ID_WMAV2: return i18n("Windows Media v2"); - case CODEC_ID_MP3LAME: + case CODEC_ID_MP3: return i18n("MPEG 1 Layer III"); case CODEC_ID_AAC: return i18n("Advanced Audio Coding (AAC)"); @@ -290,7 +290,8 @@ #ifdef FFMPEG_BUILD_PRE_4629 int len = avcodec_decode_audio( &d->formatContext->streams[0]->codec, #else - int len = avcodec_decode_audio( d->formatContext->streams[0]->codec, + d->outputBufferSize = AVCODEC_MAX_AUDIO_FRAME_SIZE; + int len = avcodec_decode_audio2( d->formatContext->streams[0]->codec, #endif (short*)d->outputBuffer, &d->outputBufferSize, d->packetData, d->packetSize );