summaryrefslogtreecommitdiff
path: root/src/demuxers/demux_qt.c
diff options
context:
space:
mode:
Diffstat (limited to 'src/demuxers/demux_qt.c')
-rw-r--r--src/demuxers/demux_qt.c13
1 files changed, 8 insertions, 5 deletions
diff --git a/src/demuxers/demux_qt.c b/src/demuxers/demux_qt.c
index 7c6f7efe3..d0fa3fd77 100644
--- a/src/demuxers/demux_qt.c
+++ b/src/demuxers/demux_qt.c
@@ -710,9 +710,11 @@ static char *qtl_file_url (input_plugin_t *input, const unsigned char *preview,
{ /* relative */
const char *dir = input->get_mrl (input);
slash = strrchr (dir, '/');
- asprintf (&url, "%.*s/%s",
- slash ? (int)(slash - dir) : 1,
- slash ? dir : ".", url);
+ if (asprintf (&url, "%.*s/%s",
+ slash ? (int)(slash - dir) : 1,
+ slash ? dir : ".", url) < 0) {
+ url = NULL;
+ }
}
}
@@ -1802,11 +1804,12 @@ static void get_next_edit_list_entry(qt_trak *trak,
int64_t *edit_list_duration,
unsigned int global_timescale) {
+ *edit_list_media_time = 0;
+ *edit_list_duration = MAX_DURATION;
+
/* if there is no edit list, set to max duration and get out */
if (!trak->edit_list_table) {
- *edit_list_media_time = 0;
- *edit_list_duration = MAX_DURATION;
debug_edit_list(" qt: no edit list table, initial = %d, %"PRId64"\n", *edit_list_media_time, *edit_list_duration);
return;