From 5081f0217869590812a0d7cb785edd8ee3aa435a Mon Sep 17 00:00:00 2001 From: Edward Hervey Date: Fri, 10 Feb 2006 10:56:05 +0000 Subject: [PATCH] ext/ffmpeg/gstffmpegcodecmap.c: added CODEC_ID_FLV1 <==> 'video/x-flash-video,flvversion=1' conversion. Original commit message from CVS: * ext/ffmpeg/gstffmpegcodecmap.c: (gst_ffmpeg_codecid_to_caps): added CODEC_ID_FLV1 <==> 'video/x-flash-video,flvversion=1' conversion. --- ChangeLog | 5 +++++ ext/ffmpeg/gstffmpegcodecmap.c | 3 ++- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index f795a34729..7d9b2ad5be 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2006-02-10 Edward Hervey + + * ext/ffmpeg/gstffmpegcodecmap.c: (gst_ffmpeg_codecid_to_caps): + added CODEC_ID_FLV1 <==> 'video/x-flash-video,flvversion=1' conversion. + 2006-02-06 Thomas Vander Stichele * ext/ffmpeg/gstffmpegcodecmap.c: (gst_ffmpeg_codecid_to_caps), diff --git a/ext/ffmpeg/gstffmpegcodecmap.c b/ext/ffmpeg/gstffmpegcodecmap.c index 8fbb805bbb..947f5e9179 100644 --- a/ext/ffmpeg/gstffmpegcodecmap.c +++ b/ext/ffmpeg/gstffmpegcodecmap.c @@ -320,7 +320,8 @@ gst_ffmpeg_codecid_to_caps (enum CodecID codec_id, break; case CODEC_ID_FLV1: - buildcaps = TRUE; + caps = GST_FF_VID_CAPS_NEW ("video/x-flash-video", + "flvversion", G_TYPE_INT, 1, NULL); break; case CODEC_ID_SVQ1: