File k3b-1.0.5-ffmpeg.patch of Package k3b - j0ke.net Open Build Service

File k3b-1.0.5-ffmpeg.patch of Package k3b (Revision 98067404527e29fd067fadaa432dc346)

Currently displaying revision 98067404527e29fd067fadaa432dc346, show latest

diff -Nur k3b-1.0.5-orig//plugins/decoder/ffmpeg/k3bffmpegwrapper.cpp k3b-1.0.5/plugins/decoder/ffmpeg/k3bffmpegwrapper.cpp
--- k3b-1.0.5-orig//plugins/decoder/ffmpeg/k3bffmpegwrapper.cpp	2008-09-16 12:19:13.000000000 +0200
+++ k3b-1.0.5/plugins/decoder/ffmpeg/k3bffmpegwrapper.cpp	2008-09-16 12:27:42.000000000 +0200
@@ -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)");
@@ -288,9 +288,9 @@
     d->outputBufferPos = d->outputBuffer;
 
 #ifdef FFMPEG_BUILD_PRE_4629
-    int len = avcodec_decode_audio( &d->formatContext->streams[0]->codec,
+    int len = avcodec_decode_audio2( &d->formatContext->streams[0]->codec,
 #else
-    int len = avcodec_decode_audio( d->formatContext->streams[0]->codec,
+    int len = avcodec_decode_audio2( d->formatContext->streams[0]->codec,
 #endif
 				    (short*)d->outputBuffer, &d->outputBufferSize,
 				    d->packetData, d->packetSize );