summaryrefslogtreecommitdiffstats
path: root/gst-libs/gst
diff options
context:
space:
mode:
authorArwed v. Merkatz <v.merkatz@gmx.net>2005-07-12 14:05:52 +0000
committerArwed v. Merkatz <v.merkatz@gmx.net>2005-07-12 14:05:52 +0000
commit17de22808de064277d26380da34f4fa8abbc7e39 (patch)
treefcecae89c7b82def01031132b5d116e1ca63e1bd /gst-libs/gst
parenta6e10669374f1219937fa5a1451626a4408fad36 (diff)
downloadgst-plugins-bad-17de22808de064277d26380da34f4fa8abbc7e39.tar.gz
gst-plugins-bad-17de22808de064277d26380da34f4fa8abbc7e39.tar.bz2
gst-plugins-bad-17de22808de064277d26380da34f4fa8abbc7e39.zip
Added FFmpegs MPEG-4 FOURCC
Original commit message from CVS: Added FFmpegs MPEG-4 FOURCC
Diffstat (limited to 'gst-libs/gst')
-rw-r--r--gst-libs/gst/riff/riff-media.c7
1 files changed, 7 insertions, 0 deletions
diff --git a/gst-libs/gst/riff/riff-media.c b/gst-libs/gst/riff/riff-media.c
index 9b754534..80954195 100644
--- a/gst-libs/gst/riff/riff-media.c
+++ b/gst-libs/gst/riff/riff-media.c
@@ -257,6 +257,13 @@ gst_riff_create_video_caps_with_data (guint32 codec_fcc,
*codec_name = g_strdup ("Microsoft ISO MPEG-4 1.1");
break;
+ case GST_MAKE_FOURCC ('F', 'M', 'P', '4'):
+ caps = gst_caps_new_simple ("video/mpeg",
+ "mpegversion", G_TYPE_INT, 4, NULL);
+ if (codec_name)
+ *codec_name = g_strdup ("FFmpeg MPEG-4");
+ break;
+
case GST_MAKE_FOURCC ('3', 'I', 'V', '1'):
case GST_MAKE_FOURCC ('3', 'I', 'V', '2'):
caps = gst_caps_new_simple ("video/x-3ivx", NULL);