On Thursday, 04 December 2008 at 21:31, Dominik 'Rathann' Mierzejewski wrote: > On Thursday, 04 December 2008 at 21:15, Dominik 'Rathann' Mierzejewski wrote: > > On Thursday, 04 December 2008 at 14:17, Dominik 'Rathann' Mierzejewski > > wrote: > > > On Wednesday, 03 December 2008 at 19:06, Dominik 'Rathann' Mierzejewski > > > wrote: > > > > In the long-standing tradition of breaking stuff right after a new > > > > release, > > > > I'm going to update x264 and ffmpeg in the devel branch. > > > > > > > > x264 brings ABI and API changes (albeit minor). I haven't checked ffmpeg > > > > yet, but there's certainly an ABI version bump in libavcodec and > > > > probably > > > > some API changes as well. > > > > > > > > Right now x264 is blocked on some ppc compilation issue which I'm > > > > currently > > > > trying to fix with the help of one x264 developer. I'll keep you posted. > > > > > > OK, x264 build succeeded. Could someone test it on ppc/ppc64? > > > > ffmpeg build coming soon, too. It brings libavcodec ABI version bump and > > some > > API changes. > > Affected packages: > > k3b-extras-freeworld
This needs the attached patch. I'd also suggest to tell upstream to compare if the avcodec_decode_audio2 call semantics are consistent its usage, because they've changed from avcodec_decode_audio. Regards, R. -- Fedora http://fedoraproject.org/wiki/User:Rathann RPMFusion http://rpmfusion.org | MPlayer http://mplayerhq.hu "Faith manages." -- Delenn to Lennier in Babylon 5:"Confessions and Lamentations"
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 );