diff options
| author | Arwed v. Merkatz <v.merkatz@gmx.net> | 2005-07-12 14:05:52 +0000 |
|---|---|---|
| committer | Arwed v. Merkatz <v.merkatz@gmx.net> | 2005-07-12 14:05:52 +0000 |
| commit | 17de22808de064277d26380da34f4fa8abbc7e39 (patch) | |
| tree | fcecae89c7b82def01031132b5d116e1ca63e1bd | |
| parent | a6e10669374f1219937fa5a1451626a4408fad36 (diff) | |
| download | gst-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
| -rw-r--r-- | ChangeLog | 6 | ||||
| -rw-r--r-- | gst-libs/gst/riff/riff-media.c | 7 |
2 files changed, 13 insertions, 0 deletions
@@ -1,3 +1,9 @@ +2005-07-12 Arwed v. Merkatz <v.merkatz@gmx.net> + + * gst-libs/gst/riff/riff-media.c: + (gst_riff_create_video_caps_with_data): + Added FFmpegs own MPEG-4 FOURCC (FMP4) + 2005-07-11 Wouter Paesen <wouter@kangaroot.net> Reviewed by: Ronald S. Bultje <rbultje@ronald.bitfreak.net> 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); |