asf: don't use fourcc
This commit is contained in:
parent
39b0b4e27f
commit
d4f1303f57
@ -2244,7 +2244,7 @@ gst_asf_demux_add_video_stream (GstASFDemux * demux,
|
|||||||
|
|
||||||
if (caps == NULL) {
|
if (caps == NULL) {
|
||||||
caps = gst_caps_new_simple ("video/x-asf-unknown", "fourcc",
|
caps = gst_caps_new_simple ("video/x-asf-unknown", "fourcc",
|
||||||
GST_TYPE_FOURCC, video->tag, NULL);
|
G_TYPE_UINT, video->tag, NULL);
|
||||||
} else {
|
} else {
|
||||||
GstStructure *s;
|
GstStructure *s;
|
||||||
gint ax, ay;
|
gint ax, ay;
|
||||||
@ -2274,7 +2274,7 @@ gst_asf_demux_add_video_stream (GstASFDemux * demux,
|
|||||||
}
|
}
|
||||||
|
|
||||||
/* add fourcc format to caps, some proprietary decoders seem to need it */
|
/* add fourcc format to caps, some proprietary decoders seem to need it */
|
||||||
gst_caps_set_simple (caps, "format", GST_TYPE_FOURCC, video->tag, NULL);
|
gst_caps_set_simple (caps, "format", G_TYPE_UINT, video->tag, NULL);
|
||||||
|
|
||||||
if (codec_name) {
|
if (codec_name) {
|
||||||
tags = gst_tag_list_new ();
|
tags = gst_tag_list_new ();
|
||||||
@ -2340,7 +2340,7 @@ gst_asf_demux_parse_stream_object (GstASFDemux * demux, guint8 * data,
|
|||||||
|
|
||||||
flags = gst_asf_demux_get_uint16 (&data, &size);
|
flags = gst_asf_demux_get_uint16 (&data, &size);
|
||||||
stream_id = flags & 0x7f;
|
stream_id = flags & 0x7f;
|
||||||
is_encrypted = ! !((flags & 0x8000) << 15);
|
is_encrypted = !!((flags & 0x8000) << 15);
|
||||||
unknown = gst_asf_demux_get_uint32 (&data, &size);
|
unknown = gst_asf_demux_get_uint32 (&data, &size);
|
||||||
|
|
||||||
GST_DEBUG_OBJECT (demux, "Found stream %u, time_offset=%" GST_TIME_FORMAT,
|
GST_DEBUG_OBJECT (demux, "Found stream %u, time_offset=%" GST_TIME_FORMAT,
|
||||||
@ -2948,8 +2948,8 @@ gst_asf_demux_process_file (GstASFDemux * demux, guint8 * data, guint64 size)
|
|||||||
max_pktsize = gst_asf_demux_get_uint32 (&data, &size);
|
max_pktsize = gst_asf_demux_get_uint32 (&data, &size);
|
||||||
min_bitrate = gst_asf_demux_get_uint32 (&data, &size);
|
min_bitrate = gst_asf_demux_get_uint32 (&data, &size);
|
||||||
|
|
||||||
demux->broadcast = ! !(flags & 0x01);
|
demux->broadcast = !!(flags & 0x01);
|
||||||
demux->seekable = ! !(flags & 0x02);
|
demux->seekable = !!(flags & 0x02);
|
||||||
|
|
||||||
GST_DEBUG_OBJECT (demux, "min_pktsize = %u", min_pktsize);
|
GST_DEBUG_OBJECT (demux, "min_pktsize = %u", min_pktsize);
|
||||||
GST_DEBUG_OBJECT (demux, "flags::broadcast = %d", demux->broadcast);
|
GST_DEBUG_OBJECT (demux, "flags::broadcast = %d", demux->broadcast);
|
||||||
|
Loading…
x
Reference in New Issue
Block a user