diff options
Diffstat (limited to 'gst/mxf')
| -rw-r--r-- | gst/mxf/mxfdemux.c | 2 | ||||
| -rw-r--r-- | gst/mxf/mxfmpeg.c | 24 |
2 files changed, 13 insertions, 13 deletions
diff --git a/gst/mxf/mxfdemux.c b/gst/mxf/mxfdemux.c index 0be16b3b88..e11a568a47 100644 --- a/gst/mxf/mxfdemux.c +++ b/gst/mxf/mxfdemux.c @@ -2385,7 +2385,7 @@ gst_mxf_demux_find_essence_element (GstMXFDemux * demux, GstFlowReturn ret = GST_FLOW_OK; guint64 old_offset = demux->offset; GstMXFDemuxPartition *old_partition = demux->current_partition; - guint i; + gint i; GST_DEBUG_OBJECT (demux, "Trying to find essence element %" G_GINT64_FORMAT " of track %u with body_sid %u (keyframe %d)", *position, diff --git a/gst/mxf/mxfmpeg.c b/gst/mxf/mxfmpeg.c index f1b74f964b..30142486e2 100644 --- a/gst/mxf/mxfmpeg.c +++ b/gst/mxf/mxfmpeg.c @@ -441,7 +441,7 @@ mxf_mpeg_is_mpeg2_keyframe (GstBuffer * buffer) guint8 type = 0; /* Found sync code */ - gst_byte_reader_skip (&reader, 3); + gst_byte_reader_skip_unchecked (&reader, 3); if (!gst_byte_reader_get_uint8 (&reader, &type)) break; @@ -465,9 +465,8 @@ mxf_mpeg_is_mpeg2_keyframe (GstBuffer * buffer) return FALSE; } } - } else { - gst_byte_reader_skip (&reader, 1); - } + } else if (gst_byte_reader_skip (&reader, 1) == FALSE) + break; } return FALSE; @@ -484,7 +483,7 @@ mxf_mpeg_is_mpeg4_keyframe (GstBuffer * buffer) guint8 type = 0; /* Found sync code */ - gst_byte_reader_skip (&reader, 3); + gst_byte_reader_skip_unchecked (&reader, 3); if (!gst_byte_reader_get_uint8 (&reader, &type)) break; @@ -502,9 +501,8 @@ mxf_mpeg_is_mpeg4_keyframe (GstBuffer * buffer) return FALSE; } } - } else { - gst_byte_reader_skip (&reader, 1); - } + } else if (gst_byte_reader_skip (&reader, 1) == FALSE) + break; } return FALSE; @@ -1024,7 +1022,7 @@ mxf_mpeg_is_mpeg2_frame (GstBuffer * buffer) guint8 type = 0; /* Found sync code */ - gst_byte_reader_skip (&reader, 3); + gst_byte_reader_skip_unchecked (&reader, 3); if (!gst_byte_reader_get_uint8 (&reader, &type)) break; @@ -1034,7 +1032,8 @@ mxf_mpeg_is_mpeg2_frame (GstBuffer * buffer) return TRUE; } } else { - gst_byte_reader_skip (&reader, 1); + if (gst_byte_reader_skip (&reader, 1) == FALSE) + break; } } @@ -1052,7 +1051,7 @@ mxf_mpeg_is_mpeg4_frame (GstBuffer * buffer) guint8 type = 0; /* Found sync code */ - gst_byte_reader_skip (&reader, 3); + gst_byte_reader_skip_unchecked (&reader, 3); if (!gst_byte_reader_get_uint8 (&reader, &type)) break; @@ -1062,7 +1061,8 @@ mxf_mpeg_is_mpeg4_frame (GstBuffer * buffer) return TRUE; } } else { - gst_byte_reader_skip (&reader, 1); + if (gst_byte_reader_skip (&reader, 1) == FALSE) + break; } } |