Commit b85dbe68 authored by Martin Storsjö's avatar Martin Storsjö
Browse files

avconv: Call exit_program instead of exit in avconv_opt as well

This seems to have been missed in 636ced8e

.
Signed-off-by: default avatarMartin Storsjö <martin@martin.st>
parent c7e921a5
......@@ -49,7 +49,7 @@
if ((ret = check_stream_specifier(fmtctx, st, spec)) > 0)\
outvar = o->name[i].u.type;\
else if (ret < 0)\
exit(1);\
exit_program(1);\
}\
}
......@@ -154,7 +154,7 @@ static double parse_frame_aspect_ratio(const char *arg)
if (!ar) {
av_log(NULL, AV_LOG_FATAL, "Incorrect aspect ratio specification.\n");
exit(1);
exit_program(1);
}
return ar;
}
......@@ -204,7 +204,7 @@ static int opt_map(void *optctx, const char *opt, const char *arg)
sync_file_idx = strtol(sync + 1, &sync, 0);
if (sync_file_idx >= nb_input_files || sync_file_idx < 0) {
av_log(NULL, AV_LOG_FATAL, "Invalid sync file index: %d.\n", sync_file_idx);
exit(1);
exit_program(1);
}
if (*sync)
sync++;
......@@ -217,7 +217,7 @@ static int opt_map(void *optctx, const char *opt, const char *arg)
if (i == input_files[sync_file_idx]->nb_streams) {
av_log(NULL, AV_LOG_FATAL, "Sync stream specification in map %s does not "
"match any streams.\n", arg);
exit(1);
exit_program(1);
}
}
......@@ -230,13 +230,13 @@ static int opt_map(void *optctx, const char *opt, const char *arg)
m->linklabel = av_get_token(&c, "]");
if (!m->linklabel) {
av_log(NULL, AV_LOG_ERROR, "Invalid output link label: %s.\n", map);
exit(1);
exit_program(1);
}
} else {
file_idx = strtol(map, &p, 0);
if (file_idx >= nb_input_files || file_idx < 0) {
av_log(NULL, AV_LOG_FATAL, "Invalid input file index: %d.\n", file_idx);
exit(1);
exit_program(1);
}
if (negative)
/* disable some already defined maps */
......@@ -271,7 +271,7 @@ static int opt_map(void *optctx, const char *opt, const char *arg)
if (!m) {
av_log(NULL, AV_LOG_FATAL, "Stream map '%s' matches no streams.\n", arg);
exit(1);
exit_program(1);
}
av_freep(&map);
......@@ -303,7 +303,7 @@ static void parse_meta_type(char *arg, char *type, int *index, const char **stre
case 's':
if (*(++arg) && *arg != ':') {
av_log(NULL, AV_LOG_FATAL, "Invalid metadata specifier %s.\n", arg);
exit(1);
exit_program(1);
}
*stream_spec = *arg == ':' ? arg + 1 : "";
break;
......@@ -314,7 +314,7 @@ static void parse_meta_type(char *arg, char *type, int *index, const char **stre
break;
default:
av_log(NULL, AV_LOG_FATAL, "Invalid metadata type %c.\n", *arg);
exit(1);
exit_program(1);
}
} else
*type = 'g';
......@@ -347,7 +347,7 @@ static int copy_metadata(char *outspec, char *inspec, AVFormatContext *oc, AVFor
if ((index) < 0 || (index) >= (nb_elems)) {\
av_log(NULL, AV_LOG_FATAL, "Invalid %s index %d while processing metadata maps.\n",\
(desc), (index));\
exit(1);\
exit_program(1);\
}
#define SET_DICT(type, meta, context, index)\
......@@ -378,11 +378,11 @@ static int copy_metadata(char *outspec, char *inspec, AVFormatContext *oc, AVFor
meta_in = &ic->streams[i]->metadata;
break;
} else if (ret < 0)
exit(1);
exit_program(1);
}
if (!meta_in) {
av_log(NULL, AV_LOG_FATAL, "Stream specifier %s does not match any streams.\n", istream_spec);
exit(1);
exit_program(1);
}
}
......@@ -392,7 +392,7 @@ static int copy_metadata(char *outspec, char *inspec, AVFormatContext *oc, AVFor
meta_out = &oc->streams[i]->metadata;
av_dict_copy(meta_out, *meta_in, AV_DICT_DONT_OVERWRITE);
} else if (ret < 0)
exit(1);
exit_program(1);
}
} else
av_dict_copy(meta_out, *meta_in, AV_DICT_DONT_OVERWRITE);
......@@ -420,11 +420,11 @@ static AVCodec *find_codec_or_die(const char *name, enum AVMediaType type, int e
if (!codec) {
av_log(NULL, AV_LOG_FATAL, "Unknown %s '%s'\n", codec_string, name);
exit(1);
exit_program(1);
}
if (codec->type != type) {
av_log(NULL, AV_LOG_FATAL, "Invalid %s type '%s'\n", codec_string, name);
exit(1);
exit_program(1);
}
return codec;
}
......@@ -455,7 +455,7 @@ static void add_input_streams(OptionsContext *o, AVFormatContext *ic)
char *framerate = NULL;
if (!ist)
exit(1);
exit_program(1);
GROW_ARRAY(input_streams, nb_input_streams);
input_streams[nb_input_streams - 1] = ist;
......@@ -482,7 +482,7 @@ static void add_input_streams(OptionsContext *o, AVFormatContext *ic)
framerate) < 0) {
av_log(NULL, AV_LOG_ERROR, "Error parsing framerate %s.\n",
framerate);
exit(1);
exit_program(1);
}
break;
......@@ -517,12 +517,12 @@ static void assert_file_overwrite(const char *filename)
fflush(stderr);
if (!read_yesno()) {
fprintf(stderr, "Not overwriting - exiting\n");
exit(1);
exit_program(1);
}
}
else {
fprintf(stderr,"File '%s' already exists. Exiting.\n", filename);
exit(1);
exit_program(1);
}
}
}
......@@ -544,7 +544,7 @@ static void dump_attachment(AVStream *st, const char *filename)
if (!*filename) {
av_log(NULL, AV_LOG_FATAL, "No filename specified and no 'filename' tag"
"in stream #%d:%d.\n", nb_input_files - 1, st->index);
exit(1);
exit_program(1);
}
assert_file_overwrite(filename);
......@@ -552,7 +552,7 @@ static void dump_attachment(AVStream *st, const char *filename)
if ((ret = avio_open2(&out, filename, AVIO_FLAG_WRITE, &int_cb, NULL)) < 0) {
av_log(NULL, AV_LOG_FATAL, "Could not open file %s for writing.\n",
filename);
exit(1);
exit_program(1);
}
avio_write(out, st->codec->extradata, st->codec->extradata_size);
......@@ -576,7 +576,7 @@ static int open_input_file(OptionsContext *o, const char *filename)
if (o->format) {
if (!(file_iformat = av_find_input_format(o->format))) {
av_log(NULL, AV_LOG_FATAL, "Unknown input format: '%s'\n", o->format);
exit(1);
exit_program(1);
}
}
......@@ -590,7 +590,7 @@ static int open_input_file(OptionsContext *o, const char *filename)
ic = avformat_alloc_context();
if (!ic) {
print_error(filename, AVERROR(ENOMEM));
exit(1);
exit_program(1);
}
if (o->nb_audio_sample_rate) {
snprintf(buf, sizeof(buf), "%d", o->audio_sample_rate[o->nb_audio_sample_rate - 1].u.i);
......@@ -631,7 +631,7 @@ static int open_input_file(OptionsContext *o, const char *filename)
err = avformat_open_input(&ic, filename, file_iformat, &o->g->format_opts);
if (err < 0) {
print_error(filename, err);
exit(1);
exit_program(1);
}
assert_avoptions(o->g->format_opts);
......@@ -649,7 +649,7 @@ static int open_input_file(OptionsContext *o, const char *filename)
if (ret < 0) {
av_log(NULL, AV_LOG_FATAL, "%s: could not find codec parameters\n", filename);
avformat_close_input(&ic);
exit(1);
exit_program(1);
}
timestamp = o->start_time;
......@@ -675,7 +675,7 @@ static int open_input_file(OptionsContext *o, const char *filename)
GROW_ARRAY(input_files, nb_input_files);
f = av_mallocz(sizeof(*f));
if (!f)
exit(1);
exit_program(1);
input_files[nb_input_files - 1] = f;
f->ctx = ic;
......@@ -705,7 +705,7 @@ static int open_input_file(OptionsContext *o, const char *filename)
"input file #%d (%s) is not a decoding option.\n", e->key,
option->help ? option->help : "", nb_input_files - 1,
filename);
exit(1);
exit_program(1);
}
av_log(NULL, AV_LOG_WARNING, "Codec AVOption %s (%s) specified for "
......@@ -743,7 +743,7 @@ static uint8_t *get_line(AVIOContext *s)
if (avio_open_dyn_buf(&line) < 0) {
av_log(NULL, AV_LOG_FATAL, "Could not alloc buffer for reading preset.\n");
exit(1);
exit_program(1);
}
while ((c = avio_r8(s)) && c != '\n')
......@@ -808,7 +808,7 @@ static OutputStream *new_output_stream(OptionsContext *o, AVFormatContext *oc, e
if (!st) {
av_log(NULL, AV_LOG_FATAL, "Could not alloc stream.\n");
exit(1);
exit_program(1);
}
if (oc->nb_streams - 1 < o->nb_streamid_map)
......@@ -816,7 +816,7 @@ static OutputStream *new_output_stream(OptionsContext *o, AVFormatContext *oc, e
GROW_ARRAY(output_streams, nb_output_streams);
if (!(ost = av_mallocz(sizeof(*ost))))
exit(1);
exit_program(1);
output_streams[nb_output_streams - 1] = ost;
ost->file_index = nb_output_files - 1;
......@@ -840,7 +840,7 @@ static OutputStream *new_output_stream(OptionsContext *o, AVFormatContext *oc, e
}
if (!(arg = strchr(buf, '='))) {
av_log(NULL, AV_LOG_FATAL, "Invalid line found in the preset file.\n");
exit(1);
exit_program(1);
}
*arg++ = 0;
av_dict_set(&ost->opts, buf, arg, AV_DICT_DONT_OVERWRITE);
......@@ -852,7 +852,7 @@ static OutputStream *new_output_stream(OptionsContext *o, AVFormatContext *oc, e
av_log(NULL, AV_LOG_FATAL,
"Preset %s specified for stream %d:%d, but could not be opened.\n",
preset, ost->file_index, ost->index);
exit(1);
exit_program(1);
}
} else {
ost->opts = filter_codec_opts(o->g->codec_opts, AV_CODEC_ID_NONE, oc, st, NULL);
......@@ -870,7 +870,7 @@ static OutputStream *new_output_stream(OptionsContext *o, AVFormatContext *oc, e
*next++ = 0;
if (!(bsfc = av_bitstream_filter_init(bsf))) {
av_log(NULL, AV_LOG_FATAL, "Unknown bitstream filter %s\n", bsf);
exit(1);
exit_program(1);
}
if (bsfc_prev)
bsfc_prev->next = bsfc;
......@@ -919,7 +919,7 @@ static void parse_matrix_coeffs(uint16_t *dest, const char *str)
p = strchr(p, ',');
if (!p) {
av_log(NULL, AV_LOG_FATAL, "Syntax error in matrix \"%s\" at coeff %d\n", str, i);
exit(1);
exit_program(1);
}
p++;
}
......@@ -966,7 +966,7 @@ static char *get_ost_filters(OptionsContext *o, AVFormatContext *oc,
if (filter_script && filter) {
av_log(NULL, AV_LOG_ERROR, "Both -filter and -filter_script set for "
"output stream #%d:%d.\n", nb_output_files, st->index);
exit(1);
exit_program(1);
}
if (filter_script)
......@@ -1004,19 +1004,19 @@ static OutputStream *new_video_stream(OptionsContext *o, AVFormatContext *oc)
MATCH_PER_STREAM_OPT(frame_rates, str, frame_rate, oc, st);
if (frame_rate && av_parse_video_rate(&ost->frame_rate, frame_rate) < 0) {
av_log(NULL, AV_LOG_FATAL, "Invalid framerate value: %s\n", frame_rate);
exit(1);
exit_program(1);
}
MATCH_PER_STREAM_OPT(frame_sizes, str, frame_size, oc, st);
if (frame_size && av_parse_video_size(&video_enc->width, &video_enc->height, frame_size) < 0) {
av_log(NULL, AV_LOG_FATAL, "Invalid frame size: %s.\n", frame_size);
exit(1);
exit_program(1);
}
MATCH_PER_STREAM_OPT(frame_pix_fmts, str, frame_pix_fmt, oc, st);
if (frame_pix_fmt && (video_enc->pix_fmt = av_get_pix_fmt(frame_pix_fmt)) == AV_PIX_FMT_NONE) {
av_log(NULL, AV_LOG_FATAL, "Unknown pixel format requested: %s.\n", frame_pix_fmt);
exit(1);
exit_program(1);
}
st->sample_aspect_ratio = video_enc->sample_aspect_ratio;
......@@ -1024,7 +1024,7 @@ static OutputStream *new_video_stream(OptionsContext *o, AVFormatContext *oc)
if (intra_matrix) {
if (!(video_enc->intra_matrix = av_mallocz(sizeof(*video_enc->intra_matrix) * 64))) {
av_log(NULL, AV_LOG_FATAL, "Could not allocate memory for intra matrix.\n");
exit(1);
exit_program(1);
}
parse_matrix_coeffs(video_enc->intra_matrix, intra_matrix);
}
......@@ -1032,7 +1032,7 @@ static OutputStream *new_video_stream(OptionsContext *o, AVFormatContext *oc)
if (inter_matrix) {
if (!(video_enc->inter_matrix = av_mallocz(sizeof(*video_enc->inter_matrix) * 64))) {
av_log(NULL, AV_LOG_FATAL, "Could not allocate memory for inter matrix.\n");
exit(1);
exit_program(1);
}
parse_matrix_coeffs(video_enc->inter_matrix, inter_matrix);
}
......@@ -1043,7 +1043,7 @@ static OutputStream *new_video_stream(OptionsContext *o, AVFormatContext *oc)
int e = sscanf(p, "%d,%d,%d", &start, &end, &q);
if (e != 3) {
av_log(NULL, AV_LOG_FATAL, "error parsing rc_override\n");
exit(1);
exit_program(1);
}
video_enc->rc_override =
av_realloc(video_enc->rc_override,
......@@ -1077,7 +1077,7 @@ static OutputStream *new_video_stream(OptionsContext *o, AVFormatContext *oc)
MATCH_PER_STREAM_OPT(passlogfiles, str, ost->logfile_prefix, oc, st);
if (ost->logfile_prefix &&
!(ost->logfile_prefix = av_strdup(ost->logfile_prefix)))
exit(1);
exit_program(1);
MATCH_PER_STREAM_OPT(forced_key_frames, str, ost->forced_keyframes, oc, st);
if (ost->forced_keyframes)
......@@ -1091,7 +1091,7 @@ static OutputStream *new_video_stream(OptionsContext *o, AVFormatContext *oc)
ost->avfilter = get_ost_filters(o, oc, ost);
if (!ost->avfilter)
exit(1);
exit_program(1);
} else {
MATCH_PER_STREAM_OPT(copy_initial_nonkeyframes, i, ost->copy_initial_nonkeyframes, oc ,st);
}
......@@ -1120,14 +1120,14 @@ static OutputStream *new_audio_stream(OptionsContext *o, AVFormatContext *oc)
if (sample_fmt &&
(audio_enc->sample_fmt = av_get_sample_fmt(sample_fmt)) == AV_SAMPLE_FMT_NONE) {
av_log(NULL, AV_LOG_FATAL, "Invalid sample format '%s'\n", sample_fmt);
exit(1);
exit_program(1);
}
MATCH_PER_STREAM_OPT(audio_sample_rate, i, audio_enc->sample_rate, oc, st);
ost->avfilter = get_ost_filters(o, oc, ost);
if (!ost->avfilter)
exit(1);
exit_program(1);
}
return ost;
......@@ -1140,7 +1140,7 @@ static OutputStream *new_data_stream(OptionsContext *o, AVFormatContext *oc)
ost = new_output_stream(o, oc, AVMEDIA_TYPE_DATA);
if (!ost->stream_copy) {
av_log(NULL, AV_LOG_FATAL, "Data stream encoding not supported yet (only streamcopy)\n");
exit(1);
exit_program(1);
}
return ost;
......@@ -1183,7 +1183,7 @@ static int opt_streamid(void *optctx, const char *opt, const char *arg)
av_log(NULL, AV_LOG_FATAL,
"Invalid value '%s' for option '%s', required syntax is 'index:value'\n",
arg, opt);
exit(1);
exit_program(1);
}
*p++ = '\0';
idx = parse_number_or_die(opt, idx_str, OPT_INT, 0, INT_MAX);
......@@ -1246,7 +1246,7 @@ static void init_output_filter(OutputFilter *ofilter, OptionsContext *o,
default:
av_log(NULL, AV_LOG_FATAL, "Only video and audio filters are supported "
"currently.\n");
exit(1);
exit_program(1);
}
ost->source_index = -1;
......@@ -1258,12 +1258,12 @@ static void init_output_filter(OutputFilter *ofilter, OptionsContext *o,
av_log(NULL, AV_LOG_ERROR, "Streamcopy requested for output stream %d:%d, "
"which is fed from a complex filtergraph. Filtering and streamcopy "
"cannot be used together.\n", ost->file_index, ost->index);
exit(1);
exit_program(1);
}
if (configure_output_filter(ofilter->graph, ofilter, ofilter->out_tmp) < 0) {
av_log(NULL, AV_LOG_FATAL, "Error configuring filter.\n");
exit(1);
exit_program(1);
}
avfilter_inout_free(&ofilter->out_tmp);
}
......@@ -1292,13 +1292,13 @@ static int open_output_file(OptionsContext *o, const char *filename)
if (configure_complex_filters() < 0) {
av_log(NULL, AV_LOG_FATAL, "Error configuring filters.\n");
exit(1);
exit_program(1);
}
GROW_ARRAY(output_files, nb_output_files);
of = av_mallocz(sizeof(*of));
if (!of)
exit(1);
exit_program(1);
output_files[nb_output_files - 1] = of;
of->ost_index = nb_output_streams;
......@@ -1314,7 +1314,7 @@ static int open_output_file(OptionsContext *o, const char *filename)
oc = avformat_alloc_context();
if (!oc) {
print_error(filename, AVERROR(ENOMEM));
exit(1);
exit_program(1);
}
of->ctx = oc;
if (o->recording_time != INT64_MAX)
......@@ -1324,14 +1324,14 @@ static int open_output_file(OptionsContext *o, const char *filename)
file_oformat = av_guess_format(o->format, NULL, NULL);
if (!file_oformat) {
av_log(NULL, AV_LOG_FATAL, "Requested output format '%s' is not a suitable output format\n", o->format);
exit(1);
exit_program(1);
}
} else {
file_oformat = av_guess_format(NULL, filename, NULL);
if (!file_oformat) {
av_log(NULL, AV_LOG_FATAL, "Unable to find a suitable output format for '%s'\n",
filename);
exit(1);
exit_program(1);
}
}
......@@ -1432,7 +1432,7 @@ loop_end:
if (!ofilter) {
av_log(NULL, AV_LOG_FATAL, "Output with label '%s' does not exist "
"in any defined filter graph.\n", map->linklabel);
exit(1);
exit_program(1);
}
init_output_filter(ofilter, o, oc);
} else {
......@@ -1446,7 +1446,7 @@ loop_end:
default:
av_log(NULL, AV_LOG_FATAL, "Cannot map stream #%d:%d - unsupported type.\n",
map->file_index, map->stream_index);
exit(1);
exit_program(1);
}
ost->source_index = input_files[map->file_index]->ist_index + map->stream_index;
......@@ -1468,17 +1468,17 @@ loop_end:
if ((err = avio_open2(&pb, o->attachments[i], AVIO_FLAG_READ, &int_cb, NULL)) < 0) {
av_log(NULL, AV_LOG_FATAL, "Could not open attachment file %s.\n",
o->attachments[i]);
exit(1);
exit_program(1);
}
if ((len = avio_size(pb)) <= 0) {
av_log(NULL, AV_LOG_FATAL, "Could not get size of the attachment %s.\n",
o->attachments[i]);
exit(1);
exit_program(1);
}
if (!(attachment = av_malloc(len))) {
av_log(NULL, AV_LOG_FATAL, "Attachment %s too large to fit into memory.\n",
o->attachments[i]);
exit(1);
exit_program(1);
}
avio_read(pb, attachment, len);
......@@ -1515,7 +1515,7 @@ loop_end:
"output file #%d (%s) is not an encoding option.\n", e->key,
option->help ? option->help : "", nb_output_files - 1,
filename);
exit(1);
exit_program(1);
}
av_log(NULL, AV_LOG_WARNING, "Codec AVOption %s (%s) specified for "
......@@ -1531,7 +1531,7 @@ loop_end:
if (oc->oformat->flags & AVFMT_NEEDNUMBER) {
if (!av_filename_number_test(oc->filename)) {
print_error(oc->filename, AVERROR(EINVAL));
exit(1);
exit_program(1);
}
}
......@@ -1544,7 +1544,7 @@ loop_end:
&oc->interrupt_callback,
&of->opts)) < 0) {
print_error(filename, err);
exit(1);
exit_program(1);
}
}
......@@ -1563,7 +1563,7 @@ loop_end:
if (in_file_index >= nb_input_files) {
av_log(NULL, AV_LOG_FATAL, "Invalid input file index %d while processing metadata maps\n", in_file_index);
exit(1);
exit_program(1);
}
copy_metadata(o->metadata_map[i].specifier, *p ? p + 1 : p, oc,
in_file_index >= 0 ?
......@@ -1583,7 +1583,7 @@ loop_end:
} else {
av_log(NULL, AV_LOG_FATAL, "Invalid input file index %d in chapter mapping.\n",
o->chapters_input_file);
exit(1);
exit_program(1);
}
}
if (o->chapters_input_file >= 0)
......@@ -1614,7 +1614,7 @@ loop_end:
if (!val) {
av_log(NULL, AV_LOG_FATAL, "No '=' character in metadata string %s.\n",
o->metadata[i].u.str);
exit(1);
exit_program(1);
}
*val++ = 0;
......@@ -1624,7 +1624,7 @@ loop_end:
if ((ret = check_stream_specifier(oc, oc->streams[j], stream_spec)) > 0) {
av_dict_set(&oc->streams[j]->metadata, o->metadata[i].u.str, *val ? val : NULL, 0);
} else if (ret < 0)
exit(1);
exit_program(1);
}
}
else {
......@@ -1635,13 +1635,13 @@ loop_end:
case 'c':
if (index < 0 || index >= oc->nb_chapters) {
av_log(NULL, AV_LOG_FATAL, "Invalid chapter index %d in metadata specifier.\n", index);
exit(1);
exit_program(1);
}
m = &oc->chapters[index]->metadata;
break;
default:
av_log(NULL, AV_LOG_FATAL, "Invalid metadata specifier %s.\n", o->metadata[i].specifier);
exit(1);
exit_program(1);
}
av_dict_set(m, o->metadata[i].u.str, *val ? val : NULL, 0);
}
......@@ -1695,7 +1695,7 @@ static int opt_target(void *optctx, const char *opt, const char *arg)
av_log(NULL, AV_LOG_FATAL, "Could not determine norm (PAL/NTSC/NTSC-Film) for target.\n");
av_log(NULL, AV_LOG_FATAL, "Please prefix target with \"pal-\", \"ntsc-\" or \"film-\",\n");
av_log(NULL, AV_LOG_FATAL, "or set a framerate with \"-r xxx\".\n");
exit(1);
exit_program(1);
}
if (!strcmp(arg, "vcd")) {
......
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