Author: hawk Date: Wed Aug 25 11:09:55 2010 GMT
Module: packages Tag: HEAD
---- Log message:
- fix building with ffmpeg 0.6
---- Files affected:
packages/quicktime4linux:
quicktime4linux.spec (1.89 -> 1.90) , quicktime4linux-ffmpeg.patch (1.5 ->
1.6)
---- Diffs:
================================================================
Index: packages/quicktime4linux/quicktime4linux.spec
diff -u packages/quicktime4linux/quicktime4linux.spec:1.89
packages/quicktime4linux/quicktime4linux.spec:1.90
--- packages/quicktime4linux/quicktime4linux.spec:1.89 Wed Aug 25 08:48:36 2010
+++ packages/quicktime4linux/quicktime4linux.spec Wed Aug 25 13:09:46 2010
@@ -17,7 +17,7 @@
BuildRequires: automake
BuildRequires: faac-devel >= 1.24
BuildRequires: faad2-devel >= 2.0
-BuildRequires: ffmpeg-devel >= 0.4.9-4.20080822
+BuildRequires: ffmpeg-devel >= 0.6
BuildRequires: lame-libs-devel >= 3.93.1
BuildRequires: libdv-devel >= 0.104
BuildRequires: libjpeg-devel
@@ -153,6 +153,9 @@
All persons listed below can be reached at <cvs_login>@pld-linux.org
$Log$
+Revision 1.90 2010/08/25 11:09:46 hawk
+- fix building with ffmpeg 0.6
+
Revision 1.89 2010/08/25 06:48:36 glen
- release 12
================================================================
Index: packages/quicktime4linux/quicktime4linux-ffmpeg.patch
diff -u packages/quicktime4linux/quicktime4linux-ffmpeg.patch:1.5
packages/quicktime4linux/quicktime4linux-ffmpeg.patch:1.6
--- packages/quicktime4linux/quicktime4linux-ffmpeg.patch:1.5 Sat Oct 4
20:30:53 2008
+++ packages/quicktime4linux/quicktime4linux-ffmpeg.patch Wed Aug 25
13:09:46 2010
@@ -40,3 +40,34 @@
(int16_t*)(codec->work_buffer + codec->output_size *
sample_size),
&bytes_decoded,
codec->packet_buffer,
+--- div3.c~ 2007-01-09 08:09:49.000000000 +0100
++++ div3.c 2010-08-25 13:05:05.434797467 +0200
+@@ -275,7 +275,7 @@
+ case PIX_FMT_YUV420P:
+ input_cmodel = BC_YUV420P;
+ break;
+- case PIX_FMT_YUV422:
++ case PIX_FMT_YUYV422:
+ input_cmodel = BC_YUV422;
+ break;
+ case PIX_FMT_YUV422P:
+--- qtffmpeg.c~ 2010-08-25 12:55:42.000000000 +0200
++++ qtffmpeg.c 2010-08-25 13:05:16.681037643 +0200
+@@ -338,7 +338,7 @@
+ case PIX_FMT_YUVJ420P:
+ return 4;
+ break;
+- case PIX_FMT_YUV422:
++ case PIX_FMT_YUYV422:
+ return 2;
+ break;
+ case PIX_FMT_YUV422P:
+@@ -546,7 +546,7 @@
+ case PIX_FMT_YUVJ420P:
+ input_cmodel = BC_YUV420P;
+ break;
+- case PIX_FMT_YUV422:
++ case PIX_FMT_YUYV422:
+ input_cmodel = BC_YUV422;
+ break;
+ case PIX_FMT_YUV422P:
================================================================
---- CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/quicktime4linux/quicktime4linux.spec?r1=1.89&r2=1.90&f=u
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/quicktime4linux/quicktime4linux-ffmpeg.patch?r1=1.5&r2=1.6&f=u
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
