From c4295a07b906e35ffc364ab1425e1bfaeb4c2358 Mon Sep 17 00:00:00 2001
From: Edward Hervey <bilboed@bilboed.com>
Date: Fri, 12 Dec 2008 07:15:22 +0000
Subject: [PATCH] gst-libs/gst/riff/riff-media.c: Add mapping for VP6 in
 avi/riff.

Original commit message from CVS:
* gst-libs/gst/riff/riff-media.c: (gst_riff_create_video_caps),
(gst_riff_create_video_template_caps):
Add mapping for VP6 in avi/riff.
---
 ChangeLog                      | 6 ++++++
 gst-libs/gst/riff/riff-media.c | 8 ++++++++
 2 files changed, 14 insertions(+)

diff --git a/ChangeLog b/ChangeLog
index ee9ef4d5e8..62630f7fd2 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2008-12-12  Edward Hervey  <edward.hervey@collabora.co.uk>
+
+	* gst-libs/gst/riff/riff-media.c: (gst_riff_create_video_caps),
+	(gst_riff_create_video_template_caps):
+	Add mapping for VP6 in avi/riff.
+
 2008-12-11  Edward Hervey  <edward.hervey@collabora.co.uk>
 
 	* gst/subparse/samiparse.c: (sami_context_push_state),
diff --git a/gst-libs/gst/riff/riff-media.c b/gst-libs/gst/riff/riff-media.c
index 63944bb351..d65550d959 100644
--- a/gst-libs/gst/riff/riff-media.c
+++ b/gst-libs/gst/riff/riff-media.c
@@ -642,6 +642,13 @@ gst_riff_create_video_caps (guint32 codec_fcc,
         *codec_name = g_strdup ("Karl Morton's video codec");
       break;
 
+    case GST_MAKE_FOURCC ('v', 'p', '6', '0'):
+    case GST_MAKE_FOURCC ('V', 'P', '6', '0'):
+      caps = gst_caps_new_simple ("video/x-vp6", NULL);
+      if (codec_name)
+        *codec_name = g_strdup ("On2 VP6");
+      break;
+
     default:
       GST_WARNING ("Unknown video fourcc %" GST_FOURCC_FORMAT,
           GST_FOURCC_ARGS (codec_fcc));
@@ -1546,6 +1553,7 @@ gst_riff_create_video_template_caps (void)
     GST_MAKE_FOURCC ('d', 'r', 'a', 'c'),
     GST_MAKE_FOURCC ('F', 'F', 'V', '1'),
     GST_MAKE_FOURCC ('K', 'M', 'V', 'C'),
+    GST_MAKE_FOURCC ('V', 'P', '6', '0'),
     /* FILL ME */
   };
   guint i;