mirror of
https://gitlab.freedesktop.org/gstreamer/gstreamer.git
synced 2024-12-25 09:40:37 +00:00
gst-libs/gst/riff/riff-media.c: Added FLV1 <==> 'video/x-flash-video,flvversion=1' conversion.
Original commit message from CVS: * gst-libs/gst/riff/riff-media.c: (gst_riff_create_video_caps), (gst_riff_create_video_template_caps): Added FLV1 <==> 'video/x-flash-video,flvversion=1' conversion. Also added the caps to the default set of riff video caps.
This commit is contained in:
parent
d5c2d63e24
commit
b6d4e180ce
2 changed files with 15 additions and 0 deletions
|
@ -1,3 +1,10 @@
|
||||||
|
2006-02-10 Edward Hervey <edward@fluendo.com>
|
||||||
|
|
||||||
|
* gst-libs/gst/riff/riff-media.c: (gst_riff_create_video_caps),
|
||||||
|
(gst_riff_create_video_template_caps):
|
||||||
|
Added FLV1 <==> 'video/x-flash-video,flvversion=1' conversion.
|
||||||
|
Also added the caps to the default set of riff video caps.
|
||||||
|
|
||||||
2006-02-09 Andy Wingo <wingo@pobox.com>
|
2006-02-09 Andy Wingo <wingo@pobox.com>
|
||||||
|
|
||||||
* ext/ogg/gstoggmux.c (GstOggPad): Keep track of both the start
|
* ext/ogg/gstoggmux.c (GstOggPad): Keep track of both the start
|
||||||
|
|
|
@ -494,6 +494,13 @@ gst_riff_create_video_caps (guint32 codec_fcc,
|
||||||
*codec_name = g_strdup ("PNG image");
|
*codec_name = g_strdup ("PNG image");
|
||||||
break;
|
break;
|
||||||
|
|
||||||
|
case GST_MAKE_FOURCC ('F', 'L', 'V', '1'):
|
||||||
|
caps = gst_caps_new_simple ("video/x-flash-video",
|
||||||
|
"flvversion", G_TYPE_INT, 1, NULL);
|
||||||
|
if (codec_name)
|
||||||
|
*codec_name = g_strdup ("Flash Video 1");
|
||||||
|
break;
|
||||||
|
|
||||||
default:
|
default:
|
||||||
GST_WARNING ("Unknown video fourcc %" GST_FOURCC_FORMAT,
|
GST_WARNING ("Unknown video fourcc %" GST_FOURCC_FORMAT,
|
||||||
GST_FOURCC_ARGS (codec_fcc));
|
GST_FOURCC_ARGS (codec_fcc));
|
||||||
|
@ -807,6 +814,7 @@ gst_riff_create_video_template_caps (void)
|
||||||
GST_MAKE_FOURCC ('S', 'P', '5', '3'),
|
GST_MAKE_FOURCC ('S', 'P', '5', '3'),
|
||||||
GST_MAKE_FOURCC ('P', 'N', 'G', ' '),
|
GST_MAKE_FOURCC ('P', 'N', 'G', ' '),
|
||||||
GST_MAKE_FOURCC ('C', 'Y', 'U', 'V'),
|
GST_MAKE_FOURCC ('C', 'Y', 'U', 'V'),
|
||||||
|
GST_MAKE_FOURCC ('F', 'L', 'V', '1'),
|
||||||
/* FILL ME */
|
/* FILL ME */
|
||||||
0
|
0
|
||||||
};
|
};
|
||||||
|
|
Loading…
Reference in a new issue