mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2024-07-31 02:35:11 +00:00
Code Issues 1 Projects Releases Wiki Activity

qtdemux: Fix unitialized variables on macosx

Browse source
This commit is contained in:
Edward Hervey 2011-01-05 16:24:13 +01:00
parent 6b91c5f6e7
commit ee2a615851
2 changed files with 14 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
gst/qtdemux/qtdemux.c
View file

@ -1965,8 +1965,8 @@ extract_initial_length_and_fourcc (const guint8 * data, guint size,
static gboolean static gboolean
qtdemux_parse_mehd (GstQTDemux * qtdemux, GstByteReader * br) qtdemux_parse_mehd (GstQTDemux * qtdemux, GstByteReader * br)
{ {
guint32 version; guint32 version = 0;
guint64 duration; guint64 duration = 0;
if (!gst_byte_reader_get_uint32_be (br, &version)) if (!gst_byte_reader_get_uint32_be (br, &version))
goto failed; goto failed;
@ -1976,7 +1976,7 @@ qtdemux_parse_mehd (GstQTDemux * qtdemux, GstByteReader * br)
if (!gst_byte_reader_get_uint64_be (br, &duration)) if (!gst_byte_reader_get_uint64_be (br, &duration))
goto failed; goto failed;
} else { } else {
guint32 dur; guint32 dur = 0;
if (!gst_byte_reader_get_uint32_be (br, &dur)) if (!gst_byte_reader_get_uint32_be (br, &dur))
goto failed; goto failed;
@ -2008,7 +2008,7 @@ qtdemux_parse_trex (GstQTDemux * qtdemux, QtDemuxStream * stream,
trex = qtdemux_tree_get_child_by_type_full (mvex, FOURCC_trex, trex = qtdemux_tree_get_child_by_type_full (mvex, FOURCC_trex,
&trex_data); &trex_data);
while (trex) { while (trex) {
guint32 id, dur, size, flags; guint32 id = 0, dur = 0, size = 0, flags = 0;
/* skip version/flags */ /* skip version/flags */
if (!gst_byte_reader_skip (&trex_data, 4)) if (!gst_byte_reader_skip (&trex_data, 4))
@ -2066,7 +2066,7 @@ qtdemux_parse_trun (GstQTDemux * qtdemux, GstByteReader * trun,
{ {
guint64 timestamp; guint64 timestamp;
gint32 data_offset = 0; gint32 data_offset = 0;
guint32 flags, first_flags = 0, samples_count; guint32 flags = 0, first_flags = 0, samples_count = 0;
gint i; gint i;
guint8 *data; guint8 *data;
guint entry_size, dur_offset, size_offset, flags_offset = 0, ct_offset = 0; guint entry_size, dur_offset, size_offset, flags_offset = 0, ct_offset = 0;
@ -2290,8 +2290,8 @@ qtdemux_parse_tfhd (GstQTDemux * qtdemux, GstByteReader * tfhd,
guint32 * default_sample_size, guint32 * default_sample_flags, guint32 * default_sample_size, guint32 * default_sample_flags,
gint64 * base_offset) gint64 * base_offset)
{ {
guint32 flags; guint32 flags = 0;
guint32 track_id; guint32 track_id = 0;
if (!gst_byte_reader_skip (tfhd, 1) || if (!gst_byte_reader_skip (tfhd, 1) ||
!gst_byte_reader_get_uint24_be (tfhd, &flags)) !gst_byte_reader_get_uint24_be (tfhd, &flags))
@ -5201,7 +5201,7 @@ qtdemux_stbl_init (GstQTDemux * qtdemux, QtDemuxStream * stream, GNode * stbl)
/* sync sample atom */ /* sync sample atom */
stream->stps_present = FALSE; stream->stps_present = FALSE;
if ((stream->stss_present = if ((stream->stss_present =
! !qtdemux_tree_get_child_by_type_full (stbl, FOURCC_stss, !!qtdemux_tree_get_child_by_type_full (stbl, FOURCC_stss,
&stream->stss) ? TRUE : FALSE) == TRUE) { &stream->stss) ? TRUE : FALSE) == TRUE) {
/* copy atom data into a new buffer for later use */ /* copy atom data into a new buffer for later use */
stream->stss.data = g_memdup (stream->stss.data, stream->stss.size); stream->stss.data = g_memdup (stream->stss.data, stream->stss.size);
@ -5219,7 +5219,7 @@ qtdemux_stbl_init (GstQTDemux * qtdemux, QtDemuxStream * stream, GNode * stbl)
/* partial sync sample atom */ /* partial sync sample atom */
if ((stream->stps_present = if ((stream->stps_present =
! !qtdemux_tree_get_child_by_type_full (stbl, FOURCC_stps, !!qtdemux_tree_get_child_by_type_full (stbl, FOURCC_stps,
&stream->stps) ? TRUE : FALSE) == TRUE) { &stream->stps) ? TRUE : FALSE) == TRUE) {
/* copy atom data into a new buffer for later use */ /* copy atom data into a new buffer for later use */
stream->stps.data = g_memdup (stream->stps.data, stream->stps.size); stream->stps.data = g_memdup (stream->stps.data, stream->stps.size);
@ -5339,7 +5339,7 @@ qtdemux_stbl_init (GstQTDemux * qtdemux, QtDemuxStream * stream, GNode * stbl)
/* composition time-to-sample */ /* composition time-to-sample */
if ((stream->ctts_present = if ((stream->ctts_present =
! !qtdemux_tree_get_child_by_type_full (stbl, FOURCC_ctts, !!qtdemux_tree_get_child_by_type_full (stbl, FOURCC_ctts,
&stream->ctts) ? TRUE : FALSE) == TRUE) { &stream->ctts) ? TRUE : FALSE) == TRUE) {
/* copy atom data into a new buffer for later use */ /* copy atom data into a new buffer for later use */
stream->ctts.data = g_memdup (stream->ctts.data, stream->ctts.size); stream->ctts.data = g_memdup (stream->ctts.data, stream->ctts.size);

8
gst/qtdemux/qtdemux_dump.c
View file

@ -523,7 +523,7 @@ gboolean
qtdemux_dump_tfra (GstQTDemux * qtdemux, GstByteReader * data, int depth) qtdemux_dump_tfra (GstQTDemux * qtdemux, GstByteReader * data, int depth)
{ {
guint64 time = 0, moof_offset = 0; guint64 time = 0, moof_offset = 0;
guint32 len = 0, num_entries = 0, ver_flags, track_id, i; guint32 len = 0, num_entries = 0, ver_flags = 0, track_id = 0, i;
guint value_size, traf_size, trun_size, sample_size; guint value_size, traf_size, trun_size, sample_size;
if (!gst_byte_reader_get_uint32_be (data, &ver_flags)) if (!gst_byte_reader_get_uint32_be (data, &ver_flags))
@ -569,8 +569,8 @@ qtdemux_dump_tfra (GstQTDemux * qtdemux, GstByteReader * data, int depth)
gboolean gboolean
qtdemux_dump_tfhd (GstQTDemux * qtdemux, GstByteReader * data, int depth) qtdemux_dump_tfhd (GstQTDemux * qtdemux, GstByteReader * data, int depth)
{ {
guint32 flags, n, track_id; guint32 flags = 0, n = 0, track_id = 0;
guint64 base_data_offset; guint64 base_data_offset = 0;
if (!gst_byte_reader_skip (data, 1) || if (!gst_byte_reader_skip (data, 1) ||
!gst_byte_reader_get_uint24_be (data, &flags)) !gst_byte_reader_get_uint24_be (data, &flags))
@ -700,7 +700,7 @@ qtdemux_dump_trex (GstQTDemux * qtdemux, GstByteReader * data, int depth)
gboolean gboolean
qtdemux_dump_mehd (GstQTDemux * qtdemux, GstByteReader * data, int depth) qtdemux_dump_mehd (GstQTDemux * qtdemux, GstByteReader * data, int depth)
{ {
guint32 version; guint32 version = 0;
guint64 fragment_duration; guint64 fragment_duration;
guint value_size; guint value_size;