ext/ffmpeg/gstffmpegcodecmap.c: Forwardport from 0.8 to implement QT-RLE.

Original commit message from CVS:
* ext/ffmpeg/gstffmpegcodecmap.c: (gst_ffmpeg_codecid_to_caps):
Forwardport from 0.8 to implement QT-RLE.

diff --git a/ChangeLog b/ChangeLog
index ce26e25..d7ac657 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,10 @@
 2005-08-15  Ronald S. Bultje  <rbultje@ronald.bitfreak.net>
 
+       * ext/ffmpeg/gstffmpegcodecmap.c: (gst_ffmpeg_codecid_to_caps):
+         Forwardport from 0.8 to implement QT-RLE.
+
+2005-08-15  Ronald S. Bultje  <rbultje@ronald.bitfreak.net>
+
        * ext/ffmpeg/gstffmpegdec.c: (gst_ffmpegdec_sink_event):
          Flush buffers in flush-stop, not flush-start, since the task is not
          stopped yet in flush-stop, which may lead to odd crashes in random

diff --git a/ext/ffmpeg/gstffmpegcodecmap.c b/ext/ffmpeg/gstffmpegcodecmap.c
index c167933..a6379fd 100644 (file)
--- a/ext/ffmpeg/gstffmpegcodecmap.c
+++ b/ext/ffmpeg/gstffmpegcodecmap.c
@@ -462,6 +462,17 @@ gst_ffmpeg_codecid_to_caps (enum CodecID codec_id,
       }
       break;
 
+    case CODEC_ID_QTRLE:
+      caps = GST_FF_VID_CAPS_NEW ("video/x-rle",
+          "layout", G_TYPE_STRING, "quicktime", NULL);
+      if (context) {
+        gst_caps_set_simple (caps,
+            "depth", G_TYPE_INT, (gint) context->bits_per_sample, NULL);
+      } else {
+        gst_caps_set_simple (caps, "depth", GST_TYPE_INT_RANGE, 1, 64, NULL);
+      }
+      break;
+
     case CODEC_ID_MSVIDEO1:
       caps = GST_FF_VID_CAPS_NEW ("video/x-msvideocodec",
          "msvideoversion", G_TYPE_INT, 1, NULL);
@@ -483,7 +494,6 @@ gst_ffmpeg_codecid_to_caps (enum CodecID codec_id,
     case CODEC_ID_VMDAUDIO:
     case CODEC_ID_MSZH:
     case CODEC_ID_ZLIB:
-    case CODEC_ID_QTRLE:
     case CODEC_ID_SONIC:
     case CODEC_ID_SONIC_LS:
     case CODEC_ID_SNOW: