svn K3b FFmpeg patch
[email protected] Sun, 16 Nov 2008 19:39:50 -0500
| Newsgroups | gmane.comp.kde.k3b |
|---|---|
| Message-ID | <[email protected]> |
Hi, Attached is a patch to svn K3b FFmpeg code to compile cleanly against current FFmpeg code. ------------------------------------------------------------------------- This SF.Net email is sponsored by the Moblin Your Move Developer's challenge Build the coolest Linux based applications with Moblin SDK & win great prizes Grand prize is a trip for two to an Open Source event anywhere in the world http://moblin-contest.org/redirect.php?banner_id=100&url=/ _______________________________________________ K3b-user mailing list [email protected] https://lists.sourceforge.net/lists/listinfo/k3b-user
K3b-FFmpeg.patch
(text/x-diff, 1 KB)
--- ./plugins/decoder/ffmpeg/k3bffmpegwrapper.cpp.orig 2008-09-29 15:27:50.000000000 -0600
+++ ./plugins/decoder/ffmpeg/k3bffmpegwrapper.cpp 2008-11-16 03:36:42.384349570 -0700
@@ -198,8 +198,13 @@ QString K3bFFMpegFile::typeComment() con
return i18n("Windows Media v1");
case CODEC_ID_WMAV2:
return i18n("Windows Media v2");
+#if defined(CODEC_ID_MP3)
+ case CODEC_ID_MP3:
+ return i18n("MPEG 1 Layer III");
+#elif defined(CODEC_ID_MP3LAME)
case CODEC_ID_MP3LAME:
return i18n("MPEG 1 Layer III");
+#endif
case CODEC_ID_AAC:
return i18n("Advanced Audio Coding (AAC)");
default:
@@ -291,7 +296,12 @@ int K3bFFMpegFile::fillOutputBuffer()
d->outputBufferPos = d->outputBuffer;
+#if LIBAVCODEC_VERSION_MAJOR >= 52
+ d->outputBufferSize = sizeof(d->outputBuffer);
+ int len = avcodec_decode_audio2(
+#else
int len = avcodec_decode_audio(
+#endif
#ifdef FFMPEG_BUILD_PRE_4629
&d->formatContext->streams[0]->codec,
#else