ffmpegrev: Updating ffmpeg SVN revision to r16304 and update to the corresponding...

Original commit message from CVS:
* 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.

diff --git a/ChangeLog b/ChangeLog
index f6c28f1..4209734 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2008-12-24  Sebastian Dröge  <sebastian.droege@collabora.co.uk>
+
+       * 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  <edward.hervey@collabora.co.uk>
 
        * ext/ffmpeg/gstffmpegcodecmap.c: (gst_ff_aud_caps_new),

diff --git a/common b/common
index 2c4d28a..5dc8ae3 160000 (submodule)
--- a/common
+++ b/common
@@ -1 +1 @@
-Subproject commit 2c4d28a75c26e572b94a967901254caff83d85c4
+Subproject commit 5dc8ae302733ce1aae5b1aaa613ce77a8ae4b3d9

diff --git a/ext/ffmpeg/gstffmpegcodecmap.c b/ext/ffmpeg/gstffmpegcodecmap.c
index 75b7b77..e945fd2 100644 (file)
--- a/ext/ffmpeg/gstffmpegcodecmap.c
+++ b/ext/ffmpeg/gstffmpegcodecmap.c
@@ -1681,25 +1681,25 @@ gst_ffmpeg_caps_to_smpfmt (const GstCaps * caps,
   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 */
     if (gst_structure_get_int (structure, "width", &width) &&
-       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) &&
+        gst_structure_get_int (structure, "endianness", &endianness)) {
       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 @@ gst_ffmpeg_caps_to_codecid (const GstCaps * caps, AVCodecContext * context)
         case 2:
           id = CODEC_ID_RV20;
           break;
+        case 3:
+          id = CODEC_ID_RV30;
+          break;
         case 4:
           id = CODEC_ID_RV40;
           break;

diff --git a/ffmpegrev b/ffmpegrev
index 4b1dc79..ccdbf46 100644 (file)
--- a/ffmpegrev
+++ b/ffmpegrev
@@ -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}'"