From 17de22808de064277d26380da34f4fa8abbc7e39 Mon Sep 17 00:00:00 2001 From: "Arwed v. Merkatz" Date: Tue, 12 Jul 2005 14:05:52 +0000 Subject: Added FFmpegs MPEG-4 FOURCC Original commit message from CVS: Added FFmpegs MPEG-4 FOURCC --- ChangeLog | 6 ++++++ gst-libs/gst/riff/riff-media.c | 7 +++++++ 2 files changed, 13 insertions(+) diff --git a/ChangeLog b/ChangeLog index b07441d1..bf1c5afb 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +2005-07-12 Arwed v. Merkatz + + * 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 Reviewed by: Ronald S. Bultje 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); -- cgit v1.2.1