summaryrefslogtreecommitdiffstats
path: root/multimedia/cinelerra/patches/cinelerra-ffmpeg.patch
diff options
context:
space:
mode:
author Matteo Bernardini <ponce@slackbuilds.org>2012-09-16 07:02:24 +0200
committer dsomero <xgizzmo@slackbuilds.org>2012-09-16 19:44:41 -0400
commitcdd811af8e7244b3446cd052b43cae21acd7d5d6 (patch)
tree6ac8af4bca96867a5e2fc594c0d4f317d97174c1 /multimedia/cinelerra/patches/cinelerra-ffmpeg.patch
parent43c6222a6ba51d7c0563710d6d3535e62dd3f2a4 (diff)
downloadslackbuilds-cdd811af8e7244b3446cd052b43cae21acd7d5d6.tar.gz
slackbuilds-cdd811af8e7244b3446cd052b43cae21acd7d5d6.tar.xz
multimedia/cinelerra: Updated for version cv_2.2.
Signed-off-by: Matteo Bernardini <ponce@slackbuilds.org>
Diffstat (limited to '')
-rw-r--r--multimedia/cinelerra/patches/cinelerra-ffmpeg.patch (renamed from multimedia/cinelerra/ffmpeg.patch)18
1 files changed, 9 insertions, 9 deletions
diff --git a/multimedia/cinelerra/ffmpeg.patch b/multimedia/cinelerra/patches/cinelerra-ffmpeg.patch
index fa67e732b5..6f7962fb1a 100644
--- a/multimedia/cinelerra/ffmpeg.patch
+++ b/multimedia/cinelerra/patches/cinelerra-ffmpeg.patch
@@ -1,9 +1,9 @@
Fix build with ffmpeg/libav trunk / 0.7
-Index: cinelerra/cinelerra/ffmpeg.C
+Index: cinelerra-20101104/cinelerra/ffmpeg.C
===================================================================
---- cinelerra.orig/cinelerra/ffmpeg.C
-+++ cinelerra/cinelerra/ffmpeg.C
+--- cinelerra-20101104.orig/cinelerra/ffmpeg.C
++++ cinelerra-20101104/cinelerra/ffmpeg.C
@@ -364,12 +364,15 @@ int FFMPEG::decode(uint8_t *data, long d
// NOTE: frame must already have data space allocated
@@ -23,10 +23,10 @@ Index: cinelerra/cinelerra/ffmpeg.C
if (length < 0) {
printf("FFMPEG::decode error decoding frame\n");
-Index: cinelerra/quicktime/qtffmpeg.c
+Index: cinelerra-20101104/quicktime/qtffmpeg.c
===================================================================
---- cinelerra.orig/quicktime/qtffmpeg.c
-+++ cinelerra/quicktime/qtffmpeg.c
+--- cinelerra-20101104.orig/quicktime/qtffmpeg.c
++++ cinelerra-20101104/quicktime/qtffmpeg.c
@@ -181,6 +181,7 @@ static int decode_wrapper(quicktime_t *f
if(!result)
@@ -52,10 +52,10 @@ Index: cinelerra/quicktime/qtffmpeg.c
-Index: cinelerra/quicktime/wma.c
+Index: cinelerra-20101104/quicktime/wma.c
===================================================================
---- cinelerra.orig/quicktime/wma.c
-+++ cinelerra/quicktime/wma.c
+--- cinelerra-20101104.orig/quicktime/wma.c
++++ cinelerra-20101104/quicktime/wma.c
@@ -195,11 +195,14 @@ printf("decode 2 %x %llx %llx\n", chunk_
chunk_size);
#else