summaryrefslogtreecommitdiffstats
path: root/multimedia
diff options
context:
space:
mode:
author Heinz Wiesinger <pprkut@slackbuilds.org>2014-12-21 21:07:17 +0100
committer Robby Workman <rworkman@slackbuilds.org>2014-12-25 02:11:51 -0600
commitd039aac92972a004417090716b5e6bd6887a7ee5 (patch)
treee268d4ff46a849b2cec577cd64aaa488615c8d4e /multimedia
parent42e47fb7be2589e2b9e99d27f53201d6547680d6 (diff)
downloadslackbuilds-d039aac92972a004417090716b5e6bd6887a7ee5.tar.gz
slackbuilds-d039aac92972a004417090716b5e6bd6887a7ee5.tar.xz
multimedia/ffmpeg: Fix building with new libilbc.
Signed-off-by: Heinz Wiesinger <pprkut@slackbuilds.org>
Diffstat (limited to 'multimedia')
-rw-r--r--multimedia/ffmpeg/ffmpeg.SlackBuild3
-rw-r--r--multimedia/ffmpeg/libilbc.patch23
2 files changed, 26 insertions, 0 deletions
diff --git a/multimedia/ffmpeg/ffmpeg.SlackBuild b/multimedia/ffmpeg/ffmpeg.SlackBuild
index f59e7263a1..349e8045a1 100644
--- a/multimedia/ffmpeg/ffmpeg.SlackBuild
+++ b/multimedia/ffmpeg/ffmpeg.SlackBuild
@@ -127,6 +127,9 @@ find -L . \
\( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
-o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
+# Fix compiling with libilbc 2.0.x
+patch -p1 -i $CWD/libilbc.patch
+
CFLAGS="$SLKCFLAGS" \
CXXFLAGS="$SLKCFLAGS" \
./configure \
diff --git a/multimedia/ffmpeg/libilbc.patch b/multimedia/ffmpeg/libilbc.patch
new file mode 100644
index 0000000000..29274120af
--- /dev/null
+++ b/multimedia/ffmpeg/libilbc.patch
@@ -0,0 +1,23 @@
+diff --git a/libavcodec/libilbc.c b/libavcodec/libilbc.c
+index 898fe83..9fdd3c8 100644
+--- a/libavcodec/libilbc.c
++++ b/libavcodec/libilbc.c
+@@ -96,8 +96,7 @@ static int ilbc_decode_frame(AVCodecContext *avctx, void *data,
+ if ((ret = ff_get_buffer(avctx, frame, 0)) < 0)
+ return ret;
+
+- WebRtcIlbcfix_DecodeImpl((WebRtc_Word16*) frame->data[0],
+- (const WebRtc_UWord16*) buf, &s->decoder, 1);
++ WebRtcIlbcfix_DecodeImpl((int16_t *) frame->data[0], (const uint16_t *) buf, &s->decoder, 1);
+
+ *got_frame_ptr = 1;
+
+@@ -170,7 +169,7 @@ static int ilbc_encode_frame(AVCodecContext *avctx, AVPacket *avpkt,
+ if ((ret = ff_alloc_packet2(avctx, avpkt, 50)) < 0)
+ return ret;
+
+- WebRtcIlbcfix_EncodeImpl((WebRtc_UWord16*) avpkt->data, (const WebRtc_Word16*) frame->data[0], &s->encoder);
++ WebRtcIlbcfix_EncodeImpl((uint16_t *) avpkt->data, (const int16_t *) frame->data[0], &s->encoder);
+
+ avpkt->size = s->encoder.no_of_bytes;
+ *got_packet_ptr = 1;