Skip to content

F
ffmpeg
Commit eeddeb65 authored by Michael Niedermayer's avatar Michael Niedermayer
Browse files
Options

ffmpeg_opt: replace exit() by exit_program() 

Signed-off-by: 's avatarMichael Niedermayer <michaelni@gmx.at>
parent efce76a8
Show whitespace changes
Inline Side-by-side
Showing with 81 additions and 81 deletions
ffmpeg_opt.c
View file @ eeddeb65
...@@ -49,7 +49,7 @@ ...@@ -49,7 +49,7 @@
if ((ret = check_stream_specifier(fmtctx, st, spec)) > 0)\ if ((ret = check_stream_specifier(fmtctx, st, spec)) > 0)\
outvar = o->name[i].u.type;\ outvar = o->name[i].u.type;\
else if (ret < 0)\ else if (ret < 0)\
exit(1);\ exit_program(1);\
}\ }\
} }
...@@ -234,7 +234,7 @@ static int opt_map(void *optctx, const char *opt, const char *arg) ...@@ -234,7 +234,7 @@ static int opt_map(void *optctx, const char *opt, const char *arg)
sync_file_idx = strtol(sync + 1, &sync, 0); sync_file_idx = strtol(sync + 1, &sync, 0);
if (sync_file_idx >= nb_input_files || sync_file_idx < 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); av_log(NULL, AV_LOG_FATAL, "Invalid sync file index: %d.\n", sync_file_idx);
exit(1); exit_program(1);
} }
if (*sync) if (*sync)
sync++; sync++;
...@@ -247,7 +247,7 @@ static int opt_map(void *optctx, const char *opt, const char *arg) ...@@ -247,7 +247,7 @@ static int opt_map(void *optctx, const char *opt, const char *arg)
if (i == input_files[sync_file_idx]->nb_streams) { if (i == input_files[sync_file_idx]->nb_streams) {
av_log(NULL, AV_LOG_FATAL, "Sync stream specification in map %s does not " av_log(NULL, AV_LOG_FATAL, "Sync stream specification in map %s does not "
"match any streams.\n", arg); "match any streams.\n", arg);
exit(1); exit_program(1);
} }
} }
...@@ -260,13 +260,13 @@ static int opt_map(void *optctx, const char *opt, const char *arg) ...@@ -260,13 +260,13 @@ static int opt_map(void *optctx, const char *opt, const char *arg)
m->linklabel = av_get_token(&c, "]"); m->linklabel = av_get_token(&c, "]");
if (!m->linklabel) { if (!m->linklabel) {
av_log(NULL, AV_LOG_ERROR, "Invalid output link label: %s.\n", map); av_log(NULL, AV_LOG_ERROR, "Invalid output link label: %s.\n", map);
exit(1); exit_program(1);
} }
} else { } else {
file_idx = strtol(map, &p, 0); file_idx = strtol(map, &p, 0);
if (file_idx >= nb_input_files || file_idx < 0) { if (file_idx >= nb_input_files || file_idx < 0) {
av_log(NULL, AV_LOG_FATAL, "Invalid input file index: %d.\n", file_idx); av_log(NULL, AV_LOG_FATAL, "Invalid input file index: %d.\n", file_idx);
exit(1); exit_program(1);
} }
if (negative) if (negative)
/* disable some already defined maps */ /* disable some already defined maps */
...@@ -301,7 +301,7 @@ static int opt_map(void *optctx, const char *opt, const char *arg) ...@@ -301,7 +301,7 @@ static int opt_map(void *optctx, const char *opt, const char *arg)
if (!m) { if (!m) {
av_log(NULL, AV_LOG_FATAL, "Stream map '%s' matches no streams.\n", arg); av_log(NULL, AV_LOG_FATAL, "Stream map '%s' matches no streams.\n", arg);
exit(1); exit_program(1);
} }
av_freep(&map); av_freep(&map);
...@@ -343,7 +343,7 @@ static int opt_map_channel(void *optctx, const char *opt, const char *arg) ...@@ -343,7 +343,7 @@ static int opt_map_channel(void *optctx, const char *opt, const char *arg)
if (n != 3 && n != 5) { if (n != 3 && n != 5) {
av_log(NULL, AV_LOG_FATAL, "Syntax error, mapchan usage: " av_log(NULL, AV_LOG_FATAL, "Syntax error, mapchan usage: "
"[file.stream.channel|-1][:syncfile:syncstream]\n"); "[file.stream.channel|-1][:syncfile:syncstream]\n");
exit(1); exit_program(1);
} }
if (n != 5) // only file.stream.channel specified if (n != 5) // only file.stream.channel specified
...@@ -353,24 +353,24 @@ static int opt_map_channel(void *optctx, const char *opt, const char *arg) ...@@ -353,24 +353,24 @@ static int opt_map_channel(void *optctx, const char *opt, const char *arg)
if (m->file_idx < 0 || m->file_idx >= nb_input_files) { if (m->file_idx < 0 || m->file_idx >= nb_input_files) {
av_log(NULL, AV_LOG_FATAL, "mapchan: invalid input file index: %d\n", av_log(NULL, AV_LOG_FATAL, "mapchan: invalid input file index: %d\n",
m->file_idx); m->file_idx);
exit(1); exit_program(1);
} }
if (m->stream_idx < 0 || if (m->stream_idx < 0 ||
m->stream_idx >= input_files[m->file_idx]->nb_streams) { m->stream_idx >= input_files[m->file_idx]->nb_streams) {
av_log(NULL, AV_LOG_FATAL, "mapchan: invalid input file stream index #%d.%d\n", av_log(NULL, AV_LOG_FATAL, "mapchan: invalid input file stream index #%d.%d\n",
m->file_idx, m->stream_idx); m->file_idx, m->stream_idx);
exit(1); exit_program(1);
} }
st = input_files[m->file_idx]->ctx->streams[m->stream_idx]; st = input_files[m->file_idx]->ctx->streams[m->stream_idx];
if (st->codec->codec_type != AVMEDIA_TYPE_AUDIO) { if (st->codec->codec_type != AVMEDIA_TYPE_AUDIO) {
av_log(NULL, AV_LOG_FATAL, "mapchan: stream #%d.%d is not an audio stream.\n", av_log(NULL, AV_LOG_FATAL, "mapchan: stream #%d.%d is not an audio stream.\n",
m->file_idx, m->stream_idx); m->file_idx, m->stream_idx);
exit(1); exit_program(1);
} }
if (m->channel_idx < 0 || m->channel_idx >= st->codec->channels) { if (m->channel_idx < 0 || m->channel_idx >= st->codec->channels) {
av_log(NULL, AV_LOG_FATAL, "mapchan: invalid audio channel #%d.%d.%d\n", av_log(NULL, AV_LOG_FATAL, "mapchan: invalid audio channel #%d.%d.%d\n",
m->file_idx, m->stream_idx, m->channel_idx); m->file_idx, m->stream_idx, m->channel_idx);
exit(1); exit_program(1);
} }
return 0; return 0;
} }
...@@ -392,7 +392,7 @@ static void parse_meta_type(char *arg, char *type, int *index, const char **stre ...@@ -392,7 +392,7 @@ static void parse_meta_type(char *arg, char *type, int *index, const char **stre
case 's': case 's':
if (*(++arg) && *arg != ':') { if (*(++arg) && *arg != ':') {
av_log(NULL, AV_LOG_FATAL, "Invalid metadata specifier %s.\n", arg); av_log(NULL, AV_LOG_FATAL, "Invalid metadata specifier %s.\n", arg);
exit(1); exit_program(1);
} }
*stream_spec = *arg == ':' ? arg + 1 : ""; *stream_spec = *arg == ':' ? arg + 1 : "";
break; break;
...@@ -403,7 +403,7 @@ static void parse_meta_type(char *arg, char *type, int *index, const char **stre ...@@ -403,7 +403,7 @@ static void parse_meta_type(char *arg, char *type, int *index, const char **stre
break; break;
default: default:
av_log(NULL, AV_LOG_FATAL, "Invalid metadata type %c.\n", *arg); av_log(NULL, AV_LOG_FATAL, "Invalid metadata type %c.\n", *arg);
exit(1); exit_program(1);
} }
} else } else
*type = 'g'; *type = 'g';
...@@ -446,7 +446,7 @@ static int copy_metadata(char *outspec, char *inspec, AVFormatContext *oc, AVFor ...@@ -446,7 +446,7 @@ static int copy_metadata(char *outspec, char *inspec, AVFormatContext *oc, AVFor
if ((index) < 0 || (index) >= (nb_elems)) {\ if ((index) < 0 || (index) >= (nb_elems)) {\
av_log(NULL, AV_LOG_FATAL, "Invalid %s index %d while processing metadata maps.\n",\ av_log(NULL, AV_LOG_FATAL, "Invalid %s index %d while processing metadata maps.\n",\
(desc), (index));\ (desc), (index));\
exit(1);\ exit_program(1);\
} }
#define SET_DICT(type, meta, context, index)\ #define SET_DICT(type, meta, context, index)\
...@@ -477,11 +477,11 @@ static int copy_metadata(char *outspec, char *inspec, AVFormatContext *oc, AVFor ...@@ -477,11 +477,11 @@ static int copy_metadata(char *outspec, char *inspec, AVFormatContext *oc, AVFor
meta_in = &ic->streams[i]->metadata; meta_in = &ic->streams[i]->metadata;
break; break;
} else if (ret < 0) } else if (ret < 0)
exit(1); exit_program(1);
} }
if (!meta_in) { if (!meta_in) {
av_log(NULL, AV_LOG_FATAL, "Stream specifier %s does not match any streams.\n", istream_spec); av_log(NULL, AV_LOG_FATAL, "Stream specifier %s does not match any streams.\n", istream_spec);
exit(1); exit_program(1);
} }
} }
...@@ -491,7 +491,7 @@ static int copy_metadata(char *outspec, char *inspec, AVFormatContext *oc, AVFor ...@@ -491,7 +491,7 @@ static int copy_metadata(char *outspec, char *inspec, AVFormatContext *oc, AVFor
meta_out = &oc->streams[i]->metadata; meta_out = &oc->streams[i]->metadata;
av_dict_copy(meta_out, *meta_in, AV_DICT_DONT_OVERWRITE); av_dict_copy(meta_out, *meta_in, AV_DICT_DONT_OVERWRITE);
} else if (ret < 0) } else if (ret < 0)
exit(1); exit_program(1);
} }
} else } else
av_dict_copy(meta_out, *meta_in, AV_DICT_DONT_OVERWRITE); av_dict_copy(meta_out, *meta_in, AV_DICT_DONT_OVERWRITE);
...@@ -533,11 +533,11 @@ static AVCodec *find_codec_or_die(const char *name, enum AVMediaType type, int e ...@@ -533,11 +533,11 @@ static AVCodec *find_codec_or_die(const char *name, enum AVMediaType type, int e
if (!codec) { if (!codec) {
av_log(NULL, AV_LOG_FATAL, "Unknown %s '%s'\n", codec_string, name); av_log(NULL, AV_LOG_FATAL, "Unknown %s '%s'\n", codec_string, name);
exit(1); exit_program(1);
} }
if (codec->type != type) { if (codec->type != type) {
av_log(NULL, AV_LOG_FATAL, "Invalid %s type '%s'\n", codec_string, name); av_log(NULL, AV_LOG_FATAL, "Invalid %s type '%s'\n", codec_string, name);
exit(1); exit_program(1);
} }
return codec; return codec;
} }
...@@ -569,7 +569,7 @@ static void add_input_streams(OptionsContext *o, AVFormatContext *ic) ...@@ -569,7 +569,7 @@ static void add_input_streams(OptionsContext *o, AVFormatContext *ic)
char *framerate = NULL; char *framerate = NULL;
if (!ist) if (!ist)
exit(1); exit_program(1);
GROW_ARRAY(input_streams, nb_input_streams); GROW_ARRAY(input_streams, nb_input_streams);
input_streams[nb_input_streams - 1] = ist; input_streams[nb_input_streams - 1] = ist;
...@@ -615,7 +615,7 @@ static void add_input_streams(OptionsContext *o, AVFormatContext *ic) ...@@ -615,7 +615,7 @@ static void add_input_streams(OptionsContext *o, AVFormatContext *ic)
framerate) < 0) { framerate) < 0) {
av_log(NULL, AV_LOG_ERROR, "Error parsing framerate %s.\n", av_log(NULL, AV_LOG_ERROR, "Error parsing framerate %s.\n",
framerate); framerate);
exit(1); exit_program(1);
} }
ist->top_field_first = -1; ist->top_field_first = -1;
...@@ -643,7 +643,7 @@ static void add_input_streams(OptionsContext *o, AVFormatContext *ic) ...@@ -643,7 +643,7 @@ static void add_input_streams(OptionsContext *o, AVFormatContext *ic)
if (canvas_size && if (canvas_size &&
av_parse_video_size(&dec->width, &dec->height, canvas_size) < 0) { av_parse_video_size(&dec->width, &dec->height, canvas_size) < 0) {
av_log(NULL, AV_LOG_FATAL, "Invalid canvas size: %s.\n", canvas_size); av_log(NULL, AV_LOG_FATAL, "Invalid canvas size: %s.\n", canvas_size);
exit(1); exit_program(1);
} }
break; break;
} }
...@@ -669,13 +669,13 @@ static void assert_file_overwrite(const char *filename) ...@@ -669,13 +669,13 @@ static void assert_file_overwrite(const char *filename)
signal(SIGINT, SIG_DFL); signal(SIGINT, SIG_DFL);
if (!read_yesno()) { if (!read_yesno()) {
av_log(NULL, AV_LOG_FATAL, "Not overwriting - exiting\n"); av_log(NULL, AV_LOG_FATAL, "Not overwriting - exiting\n");
exit(1); exit_program(1);
} }
term_init(); term_init();
} }
else { else {
av_log(NULL, AV_LOG_FATAL, "File '%s' already exists. Exiting.\n", filename); av_log(NULL, AV_LOG_FATAL, "File '%s' already exists. Exiting.\n", filename);
exit(1); exit_program(1);
} }
} }
} }
...@@ -697,7 +697,7 @@ static void dump_attachment(AVStream *st, const char *filename) ...@@ -697,7 +697,7 @@ static void dump_attachment(AVStream *st, const char *filename)
if (!*filename) { if (!*filename) {
av_log(NULL, AV_LOG_FATAL, "No filename specified and no 'filename' tag" av_log(NULL, AV_LOG_FATAL, "No filename specified and no 'filename' tag"
"in stream #%d:%d.\n", nb_input_files - 1, st->index); "in stream #%d:%d.\n", nb_input_files - 1, st->index);
exit(1); exit_program(1);
} }
assert_file_overwrite(filename); assert_file_overwrite(filename);
...@@ -705,7 +705,7 @@ static void dump_attachment(AVStream *st, const char *filename) ...@@ -705,7 +705,7 @@ static void dump_attachment(AVStream *st, const char *filename)
if ((ret = avio_open2(&out, filename, AVIO_FLAG_WRITE, &int_cb, NULL)) < 0) { 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", av_log(NULL, AV_LOG_FATAL, "Could not open file %s for writing.\n",
filename); filename);
exit(1); exit_program(1);
} }
avio_write(out, st->codec->extradata, st->codec->extradata_size); avio_write(out, st->codec->extradata, st->codec->extradata_size);
...@@ -732,7 +732,7 @@ static int open_input_file(OptionsContext *o, const char *filename) ...@@ -732,7 +732,7 @@ static int open_input_file(OptionsContext *o, const char *filename)
if (o->format) { if (o->format) {
if (!(file_iformat = av_find_input_format(o->format))) { if (!(file_iformat = av_find_input_format(o->format))) {
av_log(NULL, AV_LOG_FATAL, "Unknown input format: '%s'\n", o->format); av_log(NULL, AV_LOG_FATAL, "Unknown input format: '%s'\n", o->format);
exit(1); exit_program(1);
} }
} }
...@@ -746,7 +746,7 @@ static int open_input_file(OptionsContext *o, const char *filename) ...@@ -746,7 +746,7 @@ static int open_input_file(OptionsContext *o, const char *filename)
ic = avformat_alloc_context(); ic = avformat_alloc_context();
if (!ic) { if (!ic) {
print_error(filename, AVERROR(ENOMEM)); print_error(filename, AVERROR(ENOMEM));
exit(1); exit_program(1);
} }
if (o->nb_audio_sample_rate) { if (o->nb_audio_sample_rate) {
snprintf(buf, sizeof(buf), "%d", o->audio_sample_rate[o->nb_audio_sample_rate - 1].u.i); snprintf(buf, sizeof(buf), "%d", o->audio_sample_rate[o->nb_audio_sample_rate - 1].u.i);
...@@ -797,7 +797,7 @@ static int open_input_file(OptionsContext *o, const char *filename) ...@@ -797,7 +797,7 @@ static int open_input_file(OptionsContext *o, const char *filename)
err = avformat_open_input(&ic, filename, file_iformat, &o->g->format_opts); err = avformat_open_input(&ic, filename, file_iformat, &o->g->format_opts);
if (err < 0) { if (err < 0) {
print_error(filename, err); print_error(filename, err);
exit(1); exit_program(1);
} }
assert_avoptions(o->g->format_opts); assert_avoptions(o->g->format_opts);
...@@ -815,7 +815,7 @@ static int open_input_file(OptionsContext *o, const char *filename) ...@@ -815,7 +815,7 @@ static int open_input_file(OptionsContext *o, const char *filename)
if (ret < 0) { if (ret < 0) {
av_log(NULL, AV_LOG_FATAL, "%s: could not find codec parameters\n", filename); av_log(NULL, AV_LOG_FATAL, "%s: could not find codec parameters\n", filename);
avformat_close_input(&ic); avformat_close_input(&ic);
exit(1); exit_program(1);
} }
timestamp = o->start_time; timestamp = o->start_time;
...@@ -841,7 +841,7 @@ static int open_input_file(OptionsContext *o, const char *filename) ...@@ -841,7 +841,7 @@ static int open_input_file(OptionsContext *o, const char *filename)
GROW_ARRAY(input_files, nb_input_files); GROW_ARRAY(input_files, nb_input_files);
f = av_mallocz(sizeof(*f)); f = av_mallocz(sizeof(*f));
if (!f) if (!f)
exit(1); exit_program(1);
input_files[nb_input_files - 1] = f; input_files[nb_input_files - 1] = f;
f->ctx = ic; f->ctx = ic;
...@@ -871,7 +871,7 @@ static int open_input_file(OptionsContext *o, const char *filename) ...@@ -871,7 +871,7 @@ static int open_input_file(OptionsContext *o, const char *filename)
"input file #%d (%s) is not a decoding option.\n", e->key, "input file #%d (%s) is not a decoding option.\n", e->key,
option->help ? option->help : "", nb_input_files - 1, option->help ? option->help : "", nb_input_files - 1,
filename); filename);
exit(1); exit_program(1);
} }
av_log(NULL, AV_LOG_WARNING, "Codec AVOption %s (%s) specified for " av_log(NULL, AV_LOG_WARNING, "Codec AVOption %s (%s) specified for "
...@@ -909,7 +909,7 @@ static uint8_t *get_line(AVIOContext *s) ...@@ -909,7 +909,7 @@ static uint8_t *get_line(AVIOContext *s)
if (avio_open_dyn_buf(&line) < 0) { if (avio_open_dyn_buf(&line) < 0) {
av_log(NULL, AV_LOG_FATAL, "Could not alloc buffer for reading preset.\n"); 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') while ((c = avio_r8(s)) && c != '\n')
...@@ -975,7 +975,7 @@ static OutputStream *new_output_stream(OptionsContext *o, AVFormatContext *oc, e ...@@ -975,7 +975,7 @@ static OutputStream *new_output_stream(OptionsContext *o, AVFormatContext *oc, e
if (!st) { if (!st) {
av_log(NULL, AV_LOG_FATAL, "Could not alloc stream.\n"); 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) if (oc->nb_streams - 1 < o->nb_streamid_map)
...@@ -983,7 +983,7 @@ static OutputStream *new_output_stream(OptionsContext *o, AVFormatContext *oc, e ...@@ -983,7 +983,7 @@ static OutputStream *new_output_stream(OptionsContext *o, AVFormatContext *oc, e
GROW_ARRAY(output_streams, nb_output_streams); GROW_ARRAY(output_streams, nb_output_streams);
if (!(ost = av_mallocz(sizeof(*ost)))) if (!(ost = av_mallocz(sizeof(*ost))))
exit(1); exit_program(1);
output_streams[nb_output_streams - 1] = ost; output_streams[nb_output_streams - 1] = ost;
ost->file_index = nb_output_files - 1; ost->file_index = nb_output_files - 1;
...@@ -1007,7 +1007,7 @@ static OutputStream *new_output_stream(OptionsContext *o, AVFormatContext *oc, e ...@@ -1007,7 +1007,7 @@ static OutputStream *new_output_stream(OptionsContext *o, AVFormatContext *oc, e
} }
if (!(arg = strchr(buf, '='))) { if (!(arg = strchr(buf, '='))) {
av_log(NULL, AV_LOG_FATAL, "Invalid line found in the preset file.\n"); av_log(NULL, AV_LOG_FATAL, "Invalid line found in the preset file.\n");
exit(1); exit_program(1);
} }
*arg++ = 0; *arg++ = 0;
av_dict_set(&ost->opts, buf, arg, AV_DICT_DONT_OVERWRITE); av_dict_set(&ost->opts, buf, arg, AV_DICT_DONT_OVERWRITE);
...@@ -1019,7 +1019,7 @@ static OutputStream *new_output_stream(OptionsContext *o, AVFormatContext *oc, e ...@@ -1019,7 +1019,7 @@ static OutputStream *new_output_stream(OptionsContext *o, AVFormatContext *oc, e
av_log(NULL, AV_LOG_FATAL, av_log(NULL, AV_LOG_FATAL,
"Preset %s specified for stream %d:%d, but could not be opened.\n", "Preset %s specified for stream %d:%d, but could not be opened.\n",
preset, ost->file_index, ost->index); preset, ost->file_index, ost->index);
exit(1); exit_program(1);
} }
} else { } else {
ost->opts = filter_codec_opts(o->g->codec_opts, AV_CODEC_ID_NONE, oc, st, NULL); ost->opts = filter_codec_opts(o->g->codec_opts, AV_CODEC_ID_NONE, oc, st, NULL);
...@@ -1047,7 +1047,7 @@ static OutputStream *new_output_stream(OptionsContext *o, AVFormatContext *oc, e ...@@ -1047,7 +1047,7 @@ static OutputStream *new_output_stream(OptionsContext *o, AVFormatContext *oc, e
*next++ = 0; *next++ = 0;
if (!(bsfc = av_bitstream_filter_init(bsf))) { if (!(bsfc = av_bitstream_filter_init(bsf))) {
av_log(NULL, AV_LOG_FATAL, "Unknown bitstream filter %s\n", bsf); av_log(NULL, AV_LOG_FATAL, "Unknown bitstream filter %s\n", bsf);
exit(1); exit_program(1);
} }
if (bsfc_prev) if (bsfc_prev)
bsfc_prev->next = bsfc; bsfc_prev->next = bsfc;
...@@ -1105,7 +1105,7 @@ static void parse_matrix_coeffs(uint16_t *dest, const char *str) ...@@ -1105,7 +1105,7 @@ static void parse_matrix_coeffs(uint16_t *dest, const char *str)
p = strchr(p, ','); p = strchr(p, ',');
if (!p) { if (!p) {
av_log(NULL, AV_LOG_FATAL, "Syntax error in matrix \"%s\" at coeff %d\n", str, i); av_log(NULL, AV_LOG_FATAL, "Syntax error in matrix \"%s\" at coeff %d\n", str, i);
exit(1); exit_program(1);
} }
p++; p++;
} }
...@@ -1152,7 +1152,7 @@ static char *get_ost_filters(OptionsContext *o, AVFormatContext *oc, ...@@ -1152,7 +1152,7 @@ static char *get_ost_filters(OptionsContext *o, AVFormatContext *oc,
if (filter_script && filter) { if (filter_script && filter) {
av_log(NULL, AV_LOG_ERROR, "Both -filter and -filter_script set for " av_log(NULL, AV_LOG_ERROR, "Both -filter and -filter_script set for "
"output stream #%d:%d.\n", nb_output_files, st->index); "output stream #%d:%d.\n", nb_output_files, st->index);
exit(1); exit_program(1);
} }
if (filter_script) if (filter_script)
...@@ -1178,7 +1178,7 @@ static OutputStream *new_video_stream(OptionsContext *o, AVFormatContext *oc, in ...@@ -1178,7 +1178,7 @@ static OutputStream *new_video_stream(OptionsContext *o, AVFormatContext *oc, in
MATCH_PER_STREAM_OPT(frame_rates, str, frame_rate, oc, st); MATCH_PER_STREAM_OPT(frame_rates, str, frame_rate, oc, st);
if (frame_rate && av_parse_video_rate(&ost->frame_rate, frame_rate) < 0) { 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); av_log(NULL, AV_LOG_FATAL, "Invalid framerate value: %s\n", frame_rate);
exit(1); exit_program(1);
} }
MATCH_PER_STREAM_OPT(frame_aspect_ratios, str, frame_aspect_ratio, oc, st); MATCH_PER_STREAM_OPT(frame_aspect_ratios, str, frame_aspect_ratio, oc, st);
...@@ -1187,7 +1187,7 @@ static OutputStream *new_video_stream(OptionsContext *o, AVFormatContext *oc, in ...@@ -1187,7 +1187,7 @@ static OutputStream *new_video_stream(OptionsContext *o, AVFormatContext *oc, in
if (av_parse_ratio(&q, frame_aspect_ratio, 255, 0, NULL) < 0 || if (av_parse_ratio(&q, frame_aspect_ratio, 255, 0, NULL) < 0 ||
q.num <= 0 || q.den <= 0) { q.num <= 0 || q.den <= 0) {
av_log(NULL, AV_LOG_FATAL, "Invalid aspect ratio: %s\n", frame_aspect_ratio); av_log(NULL, AV_LOG_FATAL, "Invalid aspect ratio: %s\n", frame_aspect_ratio);
exit(1); exit_program(1);
} }
ost->frame_aspect_ratio = q; ost->frame_aspect_ratio = q;
} }
...@@ -1203,7 +1203,7 @@ static OutputStream *new_video_stream(OptionsContext *o, AVFormatContext *oc, in ...@@ -1203,7 +1203,7 @@ static OutputStream *new_video_stream(OptionsContext *o, AVFormatContext *oc, in
MATCH_PER_STREAM_OPT(frame_sizes, str, frame_size, oc, st); 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) { 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); av_log(NULL, AV_LOG_FATAL, "Invalid frame size: %s.\n", frame_size);
exit(1); exit_program(1);
} }
video_enc->bits_per_raw_sample = frame_bits_per_raw_sample; video_enc->bits_per_raw_sample = frame_bits_per_raw_sample;
...@@ -1215,7 +1215,7 @@ static OutputStream *new_video_stream(OptionsContext *o, AVFormatContext *oc, in ...@@ -1215,7 +1215,7 @@ static OutputStream *new_video_stream(OptionsContext *o, AVFormatContext *oc, in
} }
if (frame_pix_fmt && (video_enc->pix_fmt = av_get_pix_fmt(frame_pix_fmt)) == AV_PIX_FMT_NONE) { 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); 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; st->sample_aspect_ratio = video_enc->sample_aspect_ratio;
...@@ -1225,7 +1225,7 @@ static OutputStream *new_video_stream(OptionsContext *o, AVFormatContext *oc, in ...@@ -1225,7 +1225,7 @@ static OutputStream *new_video_stream(OptionsContext *o, AVFormatContext *oc, in
if (intra_matrix) { if (intra_matrix) {
if (!(video_enc->intra_matrix = av_mallocz(sizeof(*video_enc->intra_matrix) * 64))) { 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"); 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); parse_matrix_coeffs(video_enc->intra_matrix, intra_matrix);
} }
...@@ -1233,7 +1233,7 @@ static OutputStream *new_video_stream(OptionsContext *o, AVFormatContext *oc, in ...@@ -1233,7 +1233,7 @@ static OutputStream *new_video_stream(OptionsContext *o, AVFormatContext *oc, in
if (inter_matrix) { if (inter_matrix) {
if (!(video_enc->inter_matrix = av_mallocz(sizeof(*video_enc->inter_matrix) * 64))) { 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"); 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); parse_matrix_coeffs(video_enc->inter_matrix, inter_matrix);
} }
...@@ -1244,7 +1244,7 @@ static OutputStream *new_video_stream(OptionsContext *o, AVFormatContext *oc, in ...@@ -1244,7 +1244,7 @@ static OutputStream *new_video_stream(OptionsContext *o, AVFormatContext *oc, in
int e = sscanf(p, "%d,%d,%d", &start, &end, &q); int e = sscanf(p, "%d,%d,%d", &start, &end, &q);
if (e != 3) { if (e != 3) {
av_log(NULL, AV_LOG_FATAL, "error parsing rc_override\n"); av_log(NULL, AV_LOG_FATAL, "error parsing rc_override\n");
exit(1); exit_program(1);
} }
/* FIXME realloc failure */ /* FIXME realloc failure */
video_enc->rc_override = video_enc->rc_override =
...@@ -1285,7 +1285,7 @@ static OutputStream *new_video_stream(OptionsContext *o, AVFormatContext *oc, in ...@@ -1285,7 +1285,7 @@ static OutputStream *new_video_stream(OptionsContext *o, AVFormatContext *oc, in
MATCH_PER_STREAM_OPT(passlogfiles, str, ost->logfile_prefix, oc, st); MATCH_PER_STREAM_OPT(passlogfiles, str, ost->logfile_prefix, oc, st);
if (ost->logfile_prefix && if (ost->logfile_prefix &&
!(ost->logfile_prefix = av_strdup(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); MATCH_PER_STREAM_OPT(forced_key_frames, str, ost->forced_keyframes, oc, st);
if (ost->forced_keyframes) if (ost->forced_keyframes)
...@@ -1299,7 +1299,7 @@ static OutputStream *new_video_stream(OptionsContext *o, AVFormatContext *oc, in ...@@ -1299,7 +1299,7 @@ static OutputStream *new_video_stream(OptionsContext *o, AVFormatContext *oc, in
ost->avfilter = get_ost_filters(o, oc, ost); ost->avfilter = get_ost_filters(o, oc, ost);
if (!ost->avfilter) if (!ost->avfilter)
exit(1); exit_program(1);
} else { } else {
MATCH_PER_STREAM_OPT(copy_initial_nonkeyframes, i, ost->copy_initial_nonkeyframes, oc ,st); MATCH_PER_STREAM_OPT(copy_initial_nonkeyframes, i, ost->copy_initial_nonkeyframes, oc ,st);
} }
...@@ -1329,7 +1329,7 @@ static OutputStream *new_audio_stream(OptionsContext *o, AVFormatContext *oc, in ...@@ -1329,7 +1329,7 @@ static OutputStream *new_audio_stream(OptionsContext *o, AVFormatContext *oc, in
if (sample_fmt && if (sample_fmt &&
(audio_enc->sample_fmt = av_get_sample_fmt(sample_fmt)) == AV_SAMPLE_FMT_NONE) { (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); 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); MATCH_PER_STREAM_OPT(audio_sample_rate, i, audio_enc->sample_rate, oc, st);
...@@ -1339,7 +1339,7 @@ static OutputStream *new_audio_stream(OptionsContext *o, AVFormatContext *oc, in ...@@ -1339,7 +1339,7 @@ static OutputStream *new_audio_stream(OptionsContext *o, AVFormatContext *oc, in
ost->avfilter = get_ost_filters(o, oc, ost); ost->avfilter = get_ost_filters(o, oc, ost);
if (!ost->avfilter) if (!ost->avfilter)
exit(1); exit_program(1);
/* check for channel mapping for this audio stream */ /* check for channel mapping for this audio stream */
for (n = 0; n < o->nb_audio_channel_maps; n++) { for (n = 0; n < o->nb_audio_channel_maps; n++) {
...@@ -1367,7 +1367,7 @@ static OutputStream *new_data_stream(OptionsContext *o, AVFormatContext *oc, int ...@@ -1367,7 +1367,7 @@ static OutputStream *new_data_stream(OptionsContext *o, AVFormatContext *oc, int
ost = new_output_stream(o, oc, AVMEDIA_TYPE_DATA, source_index); ost = new_output_stream(o, oc, AVMEDIA_TYPE_DATA, source_index);
if (!ost->stream_copy) { if (!ost->stream_copy) {
av_log(NULL, AV_LOG_FATAL, "Data stream encoding not supported yet (only streamcopy)\n"); av_log(NULL, AV_LOG_FATAL, "Data stream encoding not supported yet (only streamcopy)\n");
exit(1); exit_program(1);
} }
return ost; return ost;
...@@ -1401,7 +1401,7 @@ static OutputStream *new_subtitle_stream(OptionsContext *o, AVFormatContext *oc, ...@@ -1401,7 +1401,7 @@ static OutputStream *new_subtitle_stream(OptionsContext *o, AVFormatContext *oc,
MATCH_PER_STREAM_OPT(frame_sizes, str, frame_size, oc, st); MATCH_PER_STREAM_OPT(frame_sizes, str, frame_size, oc, st);
if (frame_size && av_parse_video_size(&subtitle_enc->width, &subtitle_enc->height, frame_size) < 0) { if (frame_size && av_parse_video_size(&subtitle_enc->width, &subtitle_enc->height, frame_size) < 0) {
av_log(NULL, AV_LOG_FATAL, "Invalid frame size: %s.\n", frame_size); av_log(NULL, AV_LOG_FATAL, "Invalid frame size: %s.\n", frame_size);
exit(1); exit_program(1);
} }
} }
...@@ -1422,7 +1422,7 @@ static int opt_streamid(void *optctx, const char *opt, const char *arg) ...@@ -1422,7 +1422,7 @@ static int opt_streamid(void *optctx, const char *opt, const char *arg)
av_log(NULL, AV_LOG_FATAL, av_log(NULL, AV_LOG_FATAL,
"Invalid value '%s' for option '%s', required syntax is 'index:value'\n", "Invalid value '%s' for option '%s', required syntax is 'index:value'\n",
arg, opt); arg, opt);
exit(1); exit_program(1);
} }
*p++ = '\0'; *p++ = '\0';
idx = parse_number_or_die(opt, idx_str, OPT_INT, 0, MAX_STREAMS-1); idx = parse_number_or_die(opt, idx_str, OPT_INT, 0, MAX_STREAMS-1);
...@@ -1528,7 +1528,7 @@ static void init_output_filter(OutputFilter *ofilter, OptionsContext *o, ...@@ -1528,7 +1528,7 @@ static void init_output_filter(OutputFilter *ofilter, OptionsContext *o,
default: default:
av_log(NULL, AV_LOG_FATAL, "Only video and audio filters are supported " av_log(NULL, AV_LOG_FATAL, "Only video and audio filters are supported "
"currently.\n"); "currently.\n");
exit(1); exit_program(1);
} }
ost->source_index = -1; ost->source_index = -1;
...@@ -1540,12 +1540,12 @@ static void init_output_filter(OutputFilter *ofilter, OptionsContext *o, ...@@ -1540,12 +1540,12 @@ static void init_output_filter(OutputFilter *ofilter, OptionsContext *o,
av_log(NULL, AV_LOG_ERROR, "Streamcopy requested for output stream %d:%d, " av_log(NULL, AV_LOG_ERROR, "Streamcopy requested for output stream %d:%d, "
"which is fed from a complex filtergraph. Filtering and streamcopy " "which is fed from a complex filtergraph. Filtering and streamcopy "
"cannot be used together.\n", ost->file_index, ost->index); "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) { if (configure_output_filter(ofilter->graph, ofilter, ofilter->out_tmp) < 0) {
av_log(NULL, AV_LOG_FATAL, "Error configuring filter.\n"); av_log(NULL, AV_LOG_FATAL, "Error configuring filter.\n");
exit(1); exit_program(1);
} }
avfilter_inout_free(&ofilter->out_tmp); avfilter_inout_free(&ofilter->out_tmp);
} }
...@@ -1574,7 +1574,7 @@ static int open_output_file(OptionsContext *o, const char *filename) ...@@ -1574,7 +1574,7 @@ static int open_output_file(OptionsContext *o, const char *filename)
if (configure_complex_filters() < 0) { if (configure_complex_filters() < 0) {
av_log(NULL, AV_LOG_FATAL, "Error configuring filters.\n"); av_log(NULL, AV_LOG_FATAL, "Error configuring filters.\n");
exit(1); exit_program(1);
} }
if (o->stop_time != INT64_MAX && o->recording_time != INT64_MAX) { if (o->stop_time != INT64_MAX && o->recording_time != INT64_MAX) {
...@@ -1594,7 +1594,7 @@ static int open_output_file(OptionsContext *o, const char *filename) ...@@ -1594,7 +1594,7 @@ static int open_output_file(OptionsContext *o, const char *filename)
GROW_ARRAY(output_files, nb_output_files); GROW_ARRAY(output_files, nb_output_files);
of = av_mallocz(sizeof(*of)); of = av_mallocz(sizeof(*of));
if (!of) if (!of)
exit(1); exit_program(1);
output_files[nb_output_files - 1] = of; output_files[nb_output_files - 1] = of;
of->ost_index = nb_output_streams; of->ost_index = nb_output_streams;
...@@ -1610,7 +1610,7 @@ static int open_output_file(OptionsContext *o, const char *filename) ...@@ -1610,7 +1610,7 @@ static int open_output_file(OptionsContext *o, const char *filename)
err = avformat_alloc_output_context2(&oc, NULL, o->format, filename); err = avformat_alloc_output_context2(&oc, NULL, o->format, filename);
if (!oc) { if (!oc) {
print_error(filename, err); print_error(filename, err);
exit(1); exit_program(1);
} }
of->ctx = oc; of->ctx = oc;
...@@ -1647,7 +1647,7 @@ static int open_output_file(OptionsContext *o, const char *filename) ...@@ -1647,7 +1647,7 @@ static int open_output_file(OptionsContext *o, const char *filename)
int err = read_ffserver_streams(o, oc, filename); int err = read_ffserver_streams(o, oc, filename);
if (err < 0) { if (err < 0) {
print_error(filename, err); print_error(filename, err);
exit(1); exit_program(1);
} }
for(j = nb_output_streams - oc->nb_streams; j < nb_output_streams; j++) { for(j = nb_output_streams - oc->nb_streams; j < nb_output_streams; j++) {
ost = output_streams[j]; ost = output_streams[j];
...@@ -1665,7 +1665,7 @@ static int open_output_file(OptionsContext *o, const char *filename) ...@@ -1665,7 +1665,7 @@ static int open_output_file(OptionsContext *o, const char *filename)
} }
if(!ost->sync_ist){ if(!ost->sync_ist){
av_log(NULL, AV_LOG_FATAL, "Missing %s stream which is required by this ffm\n", av_get_media_type_string(ost->st->codec->codec_type)); av_log(NULL, AV_LOG_FATAL, "Missing %s stream which is required by this ffm\n", av_get_media_type_string(ost->st->codec->codec_type));
exit(1); exit_program(1);
} }
} }
} else if (!o->nb_stream_maps) { } else if (!o->nb_stream_maps) {
...@@ -1745,7 +1745,7 @@ loop_end: ...@@ -1745,7 +1745,7 @@ loop_end:
if (!ofilter) { if (!ofilter) {
av_log(NULL, AV_LOG_FATAL, "Output with label '%s' does not exist " av_log(NULL, AV_LOG_FATAL, "Output with label '%s' does not exist "
"in any defined filter graph, or was already used elsewhere.\n", map->linklabel); "in any defined filter graph, or was already used elsewhere.\n", map->linklabel);
exit(1); exit_program(1);
} }
init_output_filter(ofilter, o, oc); init_output_filter(ofilter, o, oc);
} else { } else {
...@@ -1770,7 +1770,7 @@ loop_end: ...@@ -1770,7 +1770,7 @@ loop_end:
default: default:
av_log(NULL, AV_LOG_FATAL, "Cannot map stream #%d:%d - unsupported type.\n", av_log(NULL, AV_LOG_FATAL, "Cannot map stream #%d:%d - unsupported type.\n",
map->file_index, map->stream_index); map->file_index, map->stream_index);
exit(1); exit_program(1);
} }
} }
} }
...@@ -1786,17 +1786,17 @@ loop_end: ...@@ -1786,17 +1786,17 @@ loop_end:
if ((err = avio_open2(&pb, o->attachments[i], AVIO_FLAG_READ, &int_cb, NULL)) < 0) { 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", av_log(NULL, AV_LOG_FATAL, "Could not open attachment file %s.\n",
o->attachments[i]); o->attachments[i]);
exit(1); exit_program(1);
} }
if ((len = avio_size(pb)) <= 0) { if ((len = avio_size(pb)) <= 0) {
av_log(NULL, AV_LOG_FATAL, "Could not get size of the attachment %s.\n", av_log(NULL, AV_LOG_FATAL, "Could not get size of the attachment %s.\n",
o->attachments[i]); o->attachments[i]);
exit(1); exit_program(1);
} }
if (!(attachment = av_malloc(len))) { if (!(attachment = av_malloc(len))) {
av_log(NULL, AV_LOG_FATAL, "Attachment %s too large to fit into memory.\n", av_log(NULL, AV_LOG_FATAL, "Attachment %s too large to fit into memory.\n",
o->attachments[i]); o->attachments[i]);
exit(1); exit_program(1);
} }
avio_read(pb, attachment, len); avio_read(pb, attachment, len);
...@@ -1820,7 +1820,7 @@ loop_end: ...@@ -1820,7 +1820,7 @@ loop_end:
&& (e = av_dict_get(o->g->codec_opts, "flags", NULL, AV_DICT_IGNORE_SUFFIX)) && (e = av_dict_get(o->g->codec_opts, "flags", NULL, AV_DICT_IGNORE_SUFFIX))
&& (!e->key[5] || check_stream_specifier(oc, ost->st, e->key+6))) && (!e->key[5] || check_stream_specifier(oc, ost->st, e->key+6)))
if (av_opt_set(ost->st->codec, "flags", e->value, 0) < 0) if (av_opt_set(ost->st->codec, "flags", e->value, 0) < 0)
exit(1); exit_program(1);
} }
/* check if all codec options have been used */ /* check if all codec options have been used */
...@@ -1844,7 +1844,7 @@ loop_end: ...@@ -1844,7 +1844,7 @@ loop_end:
"output file #%d (%s) is not an encoding option.\n", e->key, "output file #%d (%s) is not an encoding option.\n", e->key,
option->help ? option->help : "", nb_output_files - 1, option->help ? option->help : "", nb_output_files - 1,
filename); filename);
exit(1); exit_program(1);
} }
av_log(NULL, AV_LOG_WARNING, "Codec AVOption %s (%s) specified for " av_log(NULL, AV_LOG_WARNING, "Codec AVOption %s (%s) specified for "
...@@ -1860,7 +1860,7 @@ loop_end: ...@@ -1860,7 +1860,7 @@ loop_end:
if (oc->oformat->flags & AVFMT_NEEDNUMBER) { if (oc->oformat->flags & AVFMT_NEEDNUMBER) {
if (!av_filename_number_test(oc->filename)) { if (!av_filename_number_test(oc->filename)) {
print_error(oc->filename, AVERROR(EINVAL)); print_error(oc->filename, AVERROR(EINVAL));
exit(1); exit_program(1);
} }
} }
...@@ -1873,7 +1873,7 @@ loop_end: ...@@ -1873,7 +1873,7 @@ loop_end:
&oc->interrupt_callback, &oc->interrupt_callback,
&of->opts)) < 0) { &of->opts)) < 0) {
print_error(filename, err); print_error(filename, err);
exit(1); exit_program(1);
} }
} else if (strcmp(oc->oformat->name, "image2")==0 && !av_filename_number_test(filename)) } else if (strcmp(oc->oformat->name, "image2")==0 && !av_filename_number_test(filename))
assert_file_overwrite(filename); assert_file_overwrite(filename);
...@@ -1892,7 +1892,7 @@ loop_end: ...@@ -1892,7 +1892,7 @@ loop_end:
if (in_file_index >= nb_input_files) { 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); 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, copy_metadata(o->metadata_map[i].specifier, *p ? p + 1 : p, oc,
in_file_index >= 0 ? in_file_index >= 0 ?
...@@ -1912,7 +1912,7 @@ loop_end: ...@@ -1912,7 +1912,7 @@ loop_end:
} else { } else {
av_log(NULL, AV_LOG_FATAL, "Invalid input file index %d in chapter mapping.\n", av_log(NULL, AV_LOG_FATAL, "Invalid input file index %d in chapter mapping.\n",
o->chapters_input_file); o->chapters_input_file);
exit(1); exit_program(1);
} }
} }
if (o->chapters_input_file >= 0) if (o->chapters_input_file >= 0)
...@@ -1947,7 +1947,7 @@ loop_end: ...@@ -1947,7 +1947,7 @@ loop_end:
if (!val) { if (!val) {
av_log(NULL, AV_LOG_FATAL, "No '=' character in metadata string %s.\n", av_log(NULL, AV_LOG_FATAL, "No '=' character in metadata string %s.\n",
o->metadata[i].u.str); o->metadata[i].u.str);
exit(1); exit_program(1);
} }
*val++ = 0; *val++ = 0;
...@@ -1957,7 +1957,7 @@ loop_end: ...@@ -1957,7 +1957,7 @@ loop_end:
if ((ret = check_stream_specifier(oc, oc->streams[j], stream_spec)) > 0) { 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); av_dict_set(&oc->streams[j]->metadata, o->metadata[i].u.str, *val ? val : NULL, 0);
} else if (ret < 0) } else if (ret < 0)
exit(1); exit_program(1);
} }
} }
else { else {
...@@ -1968,13 +1968,13 @@ loop_end: ...@@ -1968,13 +1968,13 @@ loop_end:
case 'c': case 'c':
if (index < 0 || index >= oc->nb_chapters) { if (index < 0 || index >= oc->nb_chapters) {
av_log(NULL, AV_LOG_FATAL, "Invalid chapter index %d in metadata specifier.\n", index); 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; m = &oc->chapters[index]->metadata;
break; break;
default: default:
av_log(NULL, AV_LOG_FATAL, "Invalid metadata specifier %s.\n", o->metadata[i].specifier); 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); av_dict_set(m, o->metadata[i].u.str, *val ? val : NULL, 0);
} }
...@@ -2028,7 +2028,7 @@ static int opt_target(void *optctx, const char *opt, const char *arg) ...@@ -2028,7 +2028,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, "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, "Please prefix target with \"pal-\", \"ntsc-\" or \"film-\",\n");
av_log(NULL, AV_LOG_FATAL, "or set a framerate with \"-r xxx\".\n"); av_log(NULL, AV_LOG_FATAL, "or set a framerate with \"-r xxx\".\n");
exit(1); exit_program(1);
} }
if (!strcmp(arg, "vcd")) { if (!strcmp(arg, "vcd")) {
...@@ -2194,7 +2194,7 @@ static int opt_preset(void *optctx, const char *opt, const char *arg) ...@@ -2194,7 +2194,7 @@ static int opt_preset(void *optctx, const char *opt, const char *arg)
av_log(NULL, AV_LOG_FATAL, "Please use -preset <speed> -qp 0\n"); av_log(NULL, AV_LOG_FATAL, "Please use -preset <speed> -qp 0\n");
}else }else
av_log(NULL, AV_LOG_FATAL, "File for preset '%s' not found\n", arg); av_log(NULL, AV_LOG_FATAL, "File for preset '%s' not found\n", arg);
exit(1); exit_program(1);
} }
while (fgets(line, sizeof(line), f)) { while (fgets(line, sizeof(line), f)) {
...@@ -2206,7 +2206,7 @@ static int opt_preset(void *optctx, const char *opt, const char *arg) ...@@ -2206,7 +2206,7 @@ static int opt_preset(void *optctx, const char *opt, const char *arg)
if (!av_strtok(key, "=", &value) || if (!av_strtok(key, "=", &value) ||
!av_strtok(value, "\r\n", &endptr)) { !av_strtok(value, "\r\n", &endptr)) {
av_log(NULL, AV_LOG_FATAL, "%s: Invalid syntax: '%s'\n", filename, line); av_log(NULL, AV_LOG_FATAL, "%s: Invalid syntax: '%s'\n", filename, line);
exit(1); exit_program(1);
} }
av_log(NULL, AV_LOG_DEBUG, "ffpreset[%s]: set '%s' = '%s'\n", filename, key, value); av_log(NULL, AV_LOG_DEBUG, "ffpreset[%s]: set '%s' = '%s'\n", filename, key, value);
...@@ -2217,7 +2217,7 @@ static int opt_preset(void *optctx, const char *opt, const char *arg) ...@@ -2217,7 +2217,7 @@ static int opt_preset(void *optctx, const char *opt, const char *arg)
else if (opt_default_new(o, key, value) < 0) { else if (opt_default_new(o, key, value) < 0) {
av_log(NULL, AV_LOG_FATAL, "%s: Invalid option or argument: '%s', parsed as '%s' = '%s'\n", av_log(NULL, AV_LOG_FATAL, "%s: Invalid option or argument: '%s', parsed as '%s' = '%s'\n",
filename, line, key, value); filename, line, key, value);
exit(1); exit_program(1);
} }
} }
......
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