ext/ffmpeg/gstffmpegcodecmap.c: Add x264 to muxer (it was added to template, but...

Original commit message from CVS:
* ext/ffmpeg/gstffmpegcodecmap.c: (gst_ffmpeg_caps_to_codecid):
Add x264 to muxer (it was added to template, but I forgot to add
h264 caps recognition for some reason).

diff --git a/ChangeLog b/ChangeLog
index feb50a9..e0398c4 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2005-07-24  Ronald S. Bultje  <rbultje@ronald.bitfreak.net>
+
+       * ext/ffmpeg/gstffmpegcodecmap.c: (gst_ffmpeg_caps_to_codecid):
+         Add x264 to muxer (it was added to template, but I forgot to add
+         h264 caps recognition for some reason).
+
 2005-07-22  Ronald S. Bultje  <rbultje@ronald.bitfreak.net>
 
        * ext/ffmpeg/gstffmpegcodecmap.c:

diff --git a/ext/ffmpeg/gstffmpegcodecmap.c b/ext/ffmpeg/gstffmpegcodecmap.c
index 7b1c201..c59c6ed 100644 (file)
--- a/ext/ffmpeg/gstffmpegcodecmap.c
+++ b/ext/ffmpeg/gstffmpegcodecmap.c
@@ -1841,6 +1841,9 @@ gst_ffmpeg_caps_to_codecid (const GstCaps * caps, AVCodecContext * context)
   } else if (!strcmp (mimetype, "audio/x-amrwb")) {
     id = CODEC_ID_AMR_WB;
     audio = TRUE;
+  } else if (!strcmp (mimetype, "video/x-h264")) {
+    id = CODEC_ID_H264;
+    video = TRUE;
   } else if (!strncmp (mimetype, "audio/x-gst_ff-", 15) ) {
     gchar ext[16];
     AVCodec *codec;