[gst-cvs] thaytan mirror: mirror/ffmpeg/ mirror/ffmpeg/patches/

[<th...@ke...>]

CVS Root:       /cvs/gstreamer
Module:         mirror
Changes by:     thaytan
Date:           Sun Feb 19 2006  16:51:39 UTC

Log message:
Add new codec types to the configure.ac file

Modified files:
    ffmpeg          : configure.ac
    ffmpeg/patches  : autotools.patch

Links:
http://freedesktop.org/cgi-bin/viewcvs.cgi/gstreamer/mirror/ffmpeg/configure.ac.diff?r1=1.15&r2=1.16
http://freedesktop.org/cgi-bin/viewcvs.cgi/gstreamer/mirror/ffmpeg/patches/autotools.patch.diff?r1=1.26&r2=1.27

====Begin Diffs====
Index: configure.ac
===================================================================
RCS file: /cvs/gstreamer/mirror/ffmpeg/configure.ac,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -d -r1.15 -r1.16
--- configure.ac	24 Oct 2005 13:51:31 -0000	1.15
+++ configure.ac	19 Feb 2006 16:51:27 -0000	1.16
@@ -544,6 +544,14 @@
 AC_FF_DECODER(WS_SND1, ws-snd1, Westwood Sound-1)
 AC_FF_DECODER(VORBIS, vorbis, Vorbis Audio)
 AC_FF_DECODER(QDM2, qdm2, Q-design Music 2)
+AC_FF_DECODER(COOK, cook, RealAudio G2 Cook)
+AC_FF_DECODER(TRUESPEECH, truespeech, DSP Group TrueSpeech)
+AC_FF_DECODER(TTA, tta, Lossless True Audio)
+AC_FF_DECODER(AVS, avs, AVS Video)
+AC_FF_DECODER(BMP, bmp, BMP bitmap)
+AC_FF_DECODER(CSCD, cscd, CamStudio)
+AC_FF_DECODER(MMVIDEO, mmvideo, American Laser Games MM Video)
+AC_FF_DECODER(ZMBV, zmbv, Zip Motion Blocks Video)
 dnl amr, gsm
 
 AC_FF_ALLOW_DISABLE(CONFIG_ENCODERS, encoders, compilation of encoders)
Index: autotools.patch
RCS file: /cvs/gstreamer/mirror/ffmpeg/patches/autotools.patch,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -d -r1.26 -r1.27
--- autotools.patch	18 Feb 2006 23:05:06 -0000	1.26
+++ autotools.patch	19 Feb 2006 16:51:27 -0000	1.27
@@ -2,7 +2,7 @@
 Index: ffmpeg/AUTHORS
 ===================================================================
 --- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ ffmpeg/AUTHORS	2006-02-18 11:04:03.000000000 +0100
++++ ffmpeg/AUTHORS	2006-02-18 20:21:30.000000000 +0100
 @@ -0,0 +1,41 @@
 +This file contains the name of the people who have contributed to
 +FFmpeg. The names are sorted alphabetically by last name.
@@ -48,7 +48,7 @@
 Index: ffmpeg/ChangeLog
[...1472 lines suppressed...]
-+/null.c/1.1.1.1.10.1/Thu Jan 12 22:43:26 2006//TBRANCH-UPDATE-CVS-2006-02-17-04-00
-+/ppm.c/1.3.4.1/Mon Jan 30 23:33:19 2006//TBRANCH-UPDATE-CVS-2006-02-17-04-00
-+/watermark.c/1.2.4.1/Mon Jan 30 23:32:14 2006//TBRANCH-UPDATE-CVS-2006-02-17-04-00
++/Makefile.am/1.2/Sat Feb 18 19:21:30 2006//
++/drawtext.c/1.3/Sat Feb 18 23:15:56 2006//
++/fish.c/1.3/Sat Feb 18 23:15:56 2006//
++/imlib2.c/1.4/Sat Feb 18 23:15:56 2006//
++/null.c/1.2/Sat Feb 18 23:15:56 2006//
++/ppm.c/1.4/Sat Feb 18 23:15:56 2006//
++/watermark.c/1.3/Sat Feb 18 23:15:56 2006//
  D
 Index: ffmpeg/vhook/CVS/Repository
---- ffmpeg.orig/vhook/CVS/Repository	2006-02-18 14:48:18.000000000 +0100
-+++ ffmpeg/vhook/CVS/Repository	2005-11-22 23:31:40.000000000 +0100
+--- ffmpeg.orig/vhook/CVS/Repository	2006-02-18 20:21:26.000000000 +0100
++++ ffmpeg/vhook/CVS/Repository	2006-02-18 20:21:30.000000000 +0100
 @@ -1 +1 @@
 -mirror/ffmpeg/.pc/autotools.patch/vhook
 +mirror/ffmpeg/vhook