slomo gst-ffmpeg: gst-ffmpeg/ gst-ffmpeg/ext/ffmpeg/

CVS Root:       /cvs/gstreamer
Module:         gst-ffmpeg
Changes by:     slomo
Date:           Wed Dec 24 2008  08:10:08 UTC

Log message:
* ffmpegrev:
Updating ffmpeg SVN revision to r16304 and update to the corresponding
swscale snapshot.
* ext/ffmpeg/gstffmpegcodecmap.c: (gst_ffmpeg_caps_to_codecid):
Enable the Real Video 3.0 decoder.

Modified files:
    .               : ChangeLog ffmpegrev
    ext/ffmpeg      : gstffmpegcodecmap.c

Links:
http://freedesktop.org/cgi-bin/viewcvs.cgi/gstreamer/gst-ffmpeg/ChangeLog.diff?r1=1.538&r2=1.539
http://freedesktop.org/cgi-bin/viewcvs.cgi/gstreamer/gst-ffmpeg/ffmpegrev.diff?r1=1.12&r2=1.13
http://freedesktop.org/cgi-bin/viewcvs.cgi/gstreamer/gst-ffmpeg/ext/ffmpeg/gstffmpegcodecmap.c.diff?r1=1.175&r2=1.176

====Begin Diffs====
Index: ChangeLog
===================================================================
RCS file: /cvs/gstreamer/gst-ffmpeg/ChangeLog,v
retrieving revision 1.538
retrieving revision 1.539
diff -u -d -r1.538 -r1.539
--- ChangeLog	17 Dec 2008 12:05:11 -0000	1.538
+++ ChangeLog	24 Dec 2008 08:09:53 -0000	1.539
@@ -1,3 +1,11 @@
+2008-12-24  Sebastian Dröge  <[email protected]>
+
+	* ffmpegrev:
+	Updating ffmpeg SVN revision to r16304 and update to the corresponding
+	swscale snapshot.
+	* ext/ffmpeg/gstffmpegcodecmap.c: (gst_ffmpeg_caps_to_codecid):
+	Enable the Real Video 3.0 decoder.
 2008-12-17  Edward Hervey  <[email protected]>
 
 	* ext/ffmpeg/gstffmpegcodecmap.c: (gst_ff_aud_caps_new),
Index: ffmpegrev
RCS file: /cvs/gstreamer/gst-ffmpeg/ffmpegrev,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -d -r1.12 -r1.13
--- ffmpegrev	13 Dec 2008 06:51:26 -0000	1.12
+++ ffmpegrev	24 Dec 2008 08:09:53 -0000	1.13
@@ -1,8 +1,8 @@
-FFMPEG_REVISION=16086
+FFMPEG_REVISION=16304
 FFMPEG_CO_DIR=gst-libs/ext/ffmpeg
-FFMPEG_SVN=svn://svn.mplayerhq.hu/ffmpeg/trunk
+FFMPEG_SVN=svn://svn.ffmpeg.org/ffmpeg/trunk
 # Because ffmpeg checks out libswscale via an svn:externals, checking
 # out an old ffmpeg does not check out a corresponding libswscale.
 # Keep the swscale checkout manually synchronized, then. Update this
 # when you update FFMPEG_REVISION.
-FFMPEG_EXTERNALS_UPDATE="cd $FFMPEG_CO_DIR/libswscale && svn up -r '{2008-12-13 07:35:00 +0100}'"
+FFMPEG_EXTERNALS_UPDATE="cd $FFMPEG_CO_DIR/libswscale && svn up -r '{2008-12-24 09:04:00 +0100}'"
Index: gstffmpegcodecmap.c
RCS file: /cvs/gstreamer/gst-ffmpeg/ext/ffmpeg/gstffmpegcodecmap.c,v
retrieving revision 1.175
retrieving revision 1.176
diff -u -d -r1.175 -r1.176
--- gstffmpegcodecmap.c	17 Dec 2008 12:05:12 -0000	1.175
+++ gstffmpegcodecmap.c	24 Dec 2008 08:09:53 -0000	1.176
@@ -1681,25 +1681,25 @@
   if (!strcmp (gst_structure_get_name (structure), "audio/x-raw-float")) {
     /* FLOAT */
     if (gst_structure_get_int (structure, "width", &width) &&
-	gst_structure_get_int (structure, "endianness", &endianness)) {
+        gst_structure_get_int (structure, "endianness", &endianness)) {
       if (endianness == G_BYTE_ORDER) {
-	if (width == 32)
-	  context->sample_fmt = SAMPLE_FMT_FLT;
-	else if (width == 64)
-	  context->sample_fmt = SAMPLE_FMT_DBL;
+        if (width == 32)
+          context->sample_fmt = SAMPLE_FMT_FLT;
+        else if (width == 64)
+          context->sample_fmt = SAMPLE_FMT_DBL;
       }
     }
   } else {
     /* INT */
-	gst_structure_get_int (structure, "depth", &depth) &&
-	gst_structure_get_boolean (structure, "signed", &signedness) &&
-	gst_structure_get_int (structure, "endianness", &endianness)) { 
+        gst_structure_get_int (structure, "depth", &depth) &&
+        gst_structure_get_boolean (structure, "signed", &signedness) &&
       if ((endianness == G_BYTE_ORDER) && (signedness == TRUE)) {
-	if ((width == 16) && (depth == 16))
-	  context->sample_fmt = SAMPLE_FMT_S16;
-	else if ((width == 32) && (depth == 32))
-	  context->sample_fmt = SAMPLE_FMT_S32;
+        if ((width == 16) && (depth == 16))
+          context->sample_fmt = SAMPLE_FMT_S16;
+        else if ((width == 32) && (depth == 32))
+          context->sample_fmt = SAMPLE_FMT_S32;
   }
@@ -2815,6 +2815,9 @@
         case 2:
           id = CODEC_ID_RV20;
           break;
+        case 3:
+          id = CODEC_ID_RV30;
+          break;
         case 4:
           id = CODEC_ID_RV40;

------------------------------------------------------------------------------

_______________________________________________
gstreamer-cvs-verbose mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/gstreamer-cvs-verbose