diff options
| author | Edward Hervey <bilboed@bilboed.com> | 2008-12-12 07:15:22 +0000 |
|---|---|---|
| committer | Edward Hervey <bilboed@bilboed.com> | 2008-12-12 07:15:22 +0000 |
| commit | c4295a07b906e35ffc364ab1425e1bfaeb4c2358 (patch) | |
| tree | d0978c62ba53b06078cc6636293968a5742a530d | |
| parent | 7a83664099198db4d36b2a22d05af754b87ab23c (diff) | |
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.
| -rw-r--r-- | ChangeLog | 6 | ||||
| -rw-r--r-- | gst-libs/gst/riff/riff-media.c | 8 |
2 files changed, 14 insertions, 0 deletions
@@ -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 63944bb3..d65550d9 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; |