diff options
author | Ronald S. Bultje <rbultje@ronald.bitfreak.net> | 2005-07-23 22:10:29 +0000 |
---|---|---|
committer | Ronald S. Bultje <rbultje@ronald.bitfreak.net> | 2005-07-23 22:10:29 +0000 |
commit | 50cfdb753966e3014b8b6edc5a9b9079e298df40 (patch) | |
tree | f796767c84a8fed0f0da455fbdf1e674df1ce839 | |
parent | e24d6984e4a3f6b4bfb9a26d1b8d9fa132bd5b76 (diff) | |
download | gst-libav-50cfdb753966e3014b8b6edc5a9b9079e298df40.tar.gz |
ext/ffmpeg/gstffmpegcodecmap.c: Add x264 to muxer (it was added to template, but I forgot to add h264 caps recognitio...
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).
-rw-r--r-- | ChangeLog | 6 | ||||
-rw-r--r-- | ext/ffmpeg/gstffmpegcodecmap.c | 3 |
2 files changed, 9 insertions, 0 deletions
@@ -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 --- 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; |