Note: Due to technical difficulties, the Archives are currently not up to date.
GMANE provides an alternative service for most mailing lists. c.f. bug 424647
List Archive: gentoo-commits
loki_val 08/10/15 11:09:44
Added: k3b-1.0.5-ffmpeg-0.4.9_p20081014-API.patch
Log:
Fix for new ffmpeg API, bug 242000, thanks to Alexis Ballier.
(Portage version: 2.2_rc12/cvs/Linux 2.6.27-rc8 x86_64)
Revision Changes Path
1.1 app-cdr/k3b/files/k3b-1.0.5-ffmpeg-0.4.9_p20081014-API.patch
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-cdr/k3b/files/k3b-1.0.5-ffmpeg-0.4.9_p20081014-API.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-cdr/k3b/files/k3b-1.0.5-ffmpeg-0.4.9_p20081014-API.patch?rev=1.1&content-type=text/plain
Index: k3b-1.0.5-ffmpeg-0.4.9_p20081014-API.patch
===================================================================
Index: k3b-1.0.5/plugins/decoder/ffmpeg/k3bffmpegwrapper.cpp
===================================================================
--- k3b-1.0.5.orig/plugins/decoder/ffmpeg/k3bffmpegwrapper.cpp
+++ k3b-1.0.5/plugins/decoder/ffmpeg/k3bffmpegwrapper.cpp
@@ -194,7 +194,7 @@ QString K3bFFMpegFile::typeComment() con
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 @@ int K3bFFMpegFile::fillOutputBuffer()
#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 );
|
|