summaryrefslogtreecommitdiff
path: root/sysutils/k3b-kde4/files/patch-plugins-decoder-ffmpeg-k3bffmpegwrapper.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'sysutils/k3b-kde4/files/patch-plugins-decoder-ffmpeg-k3bffmpegwrapper.cpp')
-rw-r--r--sysutils/k3b-kde4/files/patch-plugins-decoder-ffmpeg-k3bffmpegwrapper.cpp21
1 files changed, 0 insertions, 21 deletions
diff --git a/sysutils/k3b-kde4/files/patch-plugins-decoder-ffmpeg-k3bffmpegwrapper.cpp b/sysutils/k3b-kde4/files/patch-plugins-decoder-ffmpeg-k3bffmpegwrapper.cpp
deleted file mode 100644
index 95b3aafd972e..000000000000
--- a/sysutils/k3b-kde4/files/patch-plugins-decoder-ffmpeg-k3bffmpegwrapper.cpp
+++ /dev/null
@@ -1,21 +0,0 @@
---- plugins/decoder/ffmpeg/k3bffmpegwrapper.cpp.orig 2009-08-15 21:28:47.344449975 +0200
-+++ plugins/decoder/ffmpeg/k3bffmpegwrapper.cpp 2009-08-15 21:30:16.985967181 +0200
-@@ -31,6 +31,9 @@
- #define FFMPEG_BUILD_PRE_4629
- #endif
-
-+#ifndef CODEC_ID_MP3LAME
-+#define CODEC_ID_MP3LAME CODEC_ID_MP3
-+#endif
-
- K3bFFMpegWrapper* K3bFFMpegWrapper::s_instance = 0;
-
-@@ -290,7 +293,7 @@
- #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,
-+ int len = avcodec_decode_audio2( d->formatContext->streams[0]->codec,
- #endif
- (short*)d->outputBuffer, &d->outputBufferSize,
- d->packetData, d->packetSize );