| 1 |
loki_val 08/10/15 11:09:44 |
| 2 |
|
| 3 |
Added: k3b-1.0.5-ffmpeg-0.4.9_p20081014-API.patch |
| 4 |
Log: |
| 5 |
Fix for new ffmpeg API, bug 242000, thanks to Alexis Ballier. |
| 6 |
(Portage version: 2.2_rc12/cvs/Linux 2.6.27-rc8 x86_64) |
| 7 |
|
| 8 |
Revision Changes Path |
| 9 |
1.1 app-cdr/k3b/files/k3b-1.0.5-ffmpeg-0.4.9_p20081014-API.patch |
| 10 |
|
| 11 |
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 |
| 12 |
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 |
| 13 |
|
| 14 |
Index: k3b-1.0.5-ffmpeg-0.4.9_p20081014-API.patch |
| 15 |
=================================================================== |
| 16 |
Index: k3b-1.0.5/plugins/decoder/ffmpeg/k3bffmpegwrapper.cpp |
| 17 |
=================================================================== |
| 18 |
--- k3b-1.0.5.orig/plugins/decoder/ffmpeg/k3bffmpegwrapper.cpp |
| 19 |
+++ k3b-1.0.5/plugins/decoder/ffmpeg/k3bffmpegwrapper.cpp |
| 20 |
@@ -194,7 +194,7 @@ QString K3bFFMpegFile::typeComment() con |
| 21 |
return i18n("Windows Media v1"); |
| 22 |
case CODEC_ID_WMAV2: |
| 23 |
return i18n("Windows Media v2"); |
| 24 |
- case CODEC_ID_MP3LAME: |
| 25 |
+ case CODEC_ID_MP3: |
| 26 |
return i18n("MPEG 1 Layer III"); |
| 27 |
case CODEC_ID_AAC: |
| 28 |
return i18n("Advanced Audio Coding (AAC)"); |
| 29 |
@@ -290,7 +290,8 @@ int K3bFFMpegFile::fillOutputBuffer() |
| 30 |
#ifdef FFMPEG_BUILD_PRE_4629 |
| 31 |
int len = avcodec_decode_audio( &d->formatContext->streams[0]->codec, |
| 32 |
#else |
| 33 |
- int len = avcodec_decode_audio( d->formatContext->streams[0]->codec, |
| 34 |
+ d->outputBufferSize = AVCODEC_MAX_AUDIO_FRAME_SIZE; |
| 35 |
+ int len = avcodec_decode_audio2( d->formatContext->streams[0]->codec, |
| 36 |
#endif |
| 37 |
(short*)d->outputBuffer, &d->outputBufferSize, |
| 38 |
d->packetData, d->packetSize ); |
Archives