mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2024-12-18 22:36:33 +00:00
Code Issues 1 Projects Releases Wiki Activity

Merge branch 'master' into 0.11

Browse source
This commit is contained in:
Wim Taymans 2011-07-08 12:51:14 +02:00
commit 734ec56617
3 changed files with 7 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
gst/isomp4/gstqtmux.c
View file

@ -3156,6 +3156,9 @@ gst_qt_mux_video_sink_set_caps (GstPad * pad, GstCaps * caps)
} else if (strcmp (mimetype, "video/x-vp8") == 0) { } else if (strcmp (mimetype, "video/x-vp8") == 0) {
entry.fourcc = FOURCC_VP80; entry.fourcc = FOURCC_VP80;
sync = FALSE; sync = FALSE;
} else if (strcmp (mimetype, "video/x-dirac") == 0) {
entry.fourcc = FOURCC_drac;
qtpad->have_dts = TRUE;
} else if (strcmp (mimetype, "video/x-qt-part") == 0) { } else if (strcmp (mimetype, "video/x-qt-part") == 0) {
guint32 fourcc; guint32 fourcc;

2
gst/isomp4/gstqtmuxmap.c
View file

@ -166,6 +166,8 @@ GstQTMuxFormatProp gst_qt_mux_format_list[] = {
"image/jpeg, " "image/jpeg, "
COMMON_VIDEO_CAPS_NO_FRAMERATE "; " COMMON_VIDEO_CAPS_NO_FRAMERATE "; "
"video/x-vp8, " "video/x-vp8, "
COMMON_VIDEO_CAPS "; "
"video/x-dirac, "
COMMON_VIDEO_CAPS "; " "video/x-qt-part, " COMMON_VIDEO_CAPS), COMMON_VIDEO_CAPS "; " "video/x-qt-part, " COMMON_VIDEO_CAPS),
GST_STATIC_CAPS (PCM_CAPS_FULL "; " GST_STATIC_CAPS (PCM_CAPS_FULL "; "
MP3_CAPS " ; " MP3_CAPS " ; "

4
gst/matroska/matroska-demux.c
View file

@ -2961,7 +2961,7 @@ gst_matroska_demux_parse_blockgroup_or_simpleblock (GstMatroskaDemux * demux,
GstFlowReturn ret = GST_FLOW_OK; GstFlowReturn ret = GST_FLOW_OK;
gboolean readblock = FALSE; gboolean readblock = FALSE;
guint32 id; guint32 id;
guint64 block_duration = 0; guint64 block_duration = -1;
GstBuffer *buf = NULL; GstBuffer *buf = NULL;
gint stream_num = -1, n, laces = 0; gint stream_num = -1, n, laces = 0;
guint size = 0; guint size = 0;
@ -3249,7 +3249,7 @@ gst_matroska_demux_parse_blockgroup_or_simpleblock (GstMatroskaDemux * demux,
demux->need_newsegment = FALSE; demux->need_newsegment = FALSE;
} }
if (block_duration) { if (block_duration != -1) {
if (stream->timecodescale == 1.0) if (stream->timecodescale == 1.0)
duration = gst_util_uint64_scale (block_duration, duration = gst_util_uint64_scale (block_duration,
demux->common.time_scale, 1); demux->common.time_scale, 1);