Commit 0557f1ae authored by benoit's avatar benoit

Provide a context to parse_time_or_die().

Patch by Stefano Sabatini: stefano sabatini-lala poste it


git-svn-id: file:///var/local/repositories/ffmpeg/trunk@12472 9553f0bf-9b14-0410-a0b8-cfaf0461ba5b
parent 9ae51c0a
...@@ -2580,12 +2580,12 @@ static void opt_map_meta_data(const char *arg) ...@@ -2580,12 +2580,12 @@ static void opt_map_meta_data(const char *arg)
m->in_file = strtol(p, &p, 0); m->in_file = strtol(p, &p, 0);
} }
static int64_t parse_time_or_die(const char *timestr, int is_duration) static int64_t parse_time_or_die(const char *context, const char *timestr, int is_duration)
{ {
int64_t us = parse_date(timestr, is_duration); int64_t us = parse_date(timestr, is_duration);
if (us == INT64_MIN) { if (us == INT64_MIN) {
fprintf(stderr, "Invalid %s specification: %s\n", fprintf(stderr, "Invalid %s specification for %s: %s\n",
is_duration ? "duration" : "date", timestr); is_duration ? "duration" : "date", context, timestr);
exit(1); exit(1);
} }
return us; return us;
...@@ -2593,22 +2593,22 @@ static int64_t parse_time_or_die(const char *timestr, int is_duration) ...@@ -2593,22 +2593,22 @@ static int64_t parse_time_or_die(const char *timestr, int is_duration)
static void opt_recording_time(const char *arg) static void opt_recording_time(const char *arg)
{ {
recording_time = parse_time_or_die(arg, 1); recording_time = parse_time_or_die("t", arg, 1);
} }
static void opt_start_time(const char *arg) static void opt_start_time(const char *arg)
{ {
start_time = parse_time_or_die(arg, 1); start_time = parse_time_or_die("ss", arg, 1);
} }
static void opt_rec_timestamp(const char *arg) static void opt_rec_timestamp(const char *arg)
{ {
rec_timestamp = parse_time_or_die(arg, 0) / 1000000; rec_timestamp = parse_time_or_die("timestamp", arg, 0) / 1000000;
} }
static void opt_input_ts_offset(const char *arg) static void opt_input_ts_offset(const char *arg)
{ {
input_ts_offset = parse_time_or_die(arg, 1); input_ts_offset = parse_time_or_die("itsoffset", arg, 1);
} }
static enum CodecID find_codec_or_die(const char *name, int type, int encoder) static enum CodecID find_codec_or_die(const char *name, int type, int encoder)
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment