diff options
| author | Dima Panov <fluffy@FreeBSD.org> | 2009-08-22 13:09:48 +0000 |
|---|---|---|
| committer | Dima Panov <fluffy@FreeBSD.org> | 2009-08-22 13:09:48 +0000 |
| commit | 6a2417951ef9405b5febe506b022cb485b694785 (patch) | |
| tree | bc6022784b815a455d4ea4e7e92c1c63be286074 /sysutils | |
| parent | [maintainer update] Update port: multimedia/mlt - add options to disable mmx ... (diff) | |
[patch] sysutils/k3b - fix build against new ffmpeg
PR: 137873
Submitted by: Alberto Villa <Alberto Villa <villa.alberto@gmail.com>
Approved by: tabthorpe (mentor)
Notes
Notes:
svn path=/head/; revision=240102
Diffstat (limited to 'sysutils')
| -rw-r--r-- | sysutils/k3b-kde4/files/patch-plugins-decoder-ffmpeg-k3bffmpegwrapper.cpp | 21 | ||||
| -rw-r--r-- | sysutils/k3b/files/patch-plugins-decoder-ffmpeg-k3bffmpegwrapper.cpp | 21 |
2 files changed, 42 insertions, 0 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 new file mode 100644 index 000000000000..95b3aafd972e --- /dev/null +++ b/sysutils/k3b-kde4/files/patch-plugins-decoder-ffmpeg-k3bffmpegwrapper.cpp @@ -0,0 +1,21 @@ +--- 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 ); diff --git a/sysutils/k3b/files/patch-plugins-decoder-ffmpeg-k3bffmpegwrapper.cpp b/sysutils/k3b/files/patch-plugins-decoder-ffmpeg-k3bffmpegwrapper.cpp new file mode 100644 index 000000000000..95b3aafd972e --- /dev/null +++ b/sysutils/k3b/files/patch-plugins-decoder-ffmpeg-k3bffmpegwrapper.cpp @@ -0,0 +1,21 @@ +--- 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 ); |