From 5e3f9979fae32fe837dab6cff5bde7de3c387611 Mon Sep 17 00:00:00 2001 From: Diego Elio Pettenò Date: Wed, 5 Sep 2012 07:03:56 +0000 Subject: Use atexit() instead of defining a custom exit_program() interface. --- avconv_opt.c | 130 +++++++++++++++++++++++++++++------------------------------ 1 file changed, 65 insertions(+), 65 deletions(-) (limited to 'avconv_opt.c') diff --git a/avconv_opt.c b/avconv_opt.c index 156073a84b..fc9bd5ab0f 100644 --- a/avconv_opt.c +++ b/avconv_opt.c @@ -50,7 +50,7 @@ if ((ret = check_stream_specifier(fmtctx, st, spec)) > 0)\ outvar = o->name[i].u.type;\ else if (ret < 0)\ - exit_program(1);\ + exit(1);\ }\ } @@ -140,7 +140,7 @@ static double parse_frame_aspect_ratio(const char *arg) if (!ar) { av_log(NULL, AV_LOG_FATAL, "Incorrect aspect ratio specification.\n"); - exit_program(1); + exit(1); } return ar; } @@ -190,7 +190,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_program(1); + exit(1); } if (*sync) sync++; @@ -203,7 +203,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_program(1); + exit(1); } } @@ -217,13 +217,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_program(1); + exit(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_program(1); + exit(1); } if (negative) /* disable some already defined maps */ @@ -259,7 +259,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_program(1); + exit(1); } av_freep(&map); @@ -291,7 +291,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_program(1); + exit(1); } *stream_spec = *arg == ':' ? arg + 1 : ""; break; @@ -302,7 +302,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_program(1); + exit(1); } } else *type = 'g'; @@ -331,7 +331,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_program(1);\ + exit(1);\ } #define SET_DICT(type, meta, context, index)\ @@ -360,11 +360,11 @@ static int copy_metadata(char *outspec, char *inspec, AVFormatContext *oc, AVFor meta_in = &ic->streams[i]->metadata; break; } else if (ret < 0) - exit_program(1); + exit(1); } if (!meta_in) { av_log(NULL, AV_LOG_FATAL, "Stream specifier %s does not match any streams.\n", istream_spec); - exit_program(1); + exit(1); } } @@ -374,7 +374,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_program(1); + exit(1); } } else av_dict_copy(meta_out, *meta_in, AV_DICT_DONT_OVERWRITE); @@ -402,11 +402,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_program(1); + exit(1); } if (codec->type != type) { av_log(NULL, AV_LOG_FATAL, "Invalid %s type '%s'\n", codec_string, name); - exit_program(1); + exit(1); } return codec; } @@ -439,7 +439,7 @@ static void add_input_streams(OptionsContext *o, AVFormatContext *ic) char *framerate = NULL; if (!ist) - exit_program(1); + exit(1); input_streams = grow_array(input_streams, sizeof(*input_streams), &nb_input_streams, nb_input_streams + 1); input_streams[nb_input_streams - 1] = ist; @@ -466,7 +466,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_program(1); + exit(1); } break; @@ -501,12 +501,12 @@ static void assert_file_overwrite(const char *filename) fflush(stderr); if (!read_yesno()) { fprintf(stderr, "Not overwriting - exiting\n"); - exit_program(1); + exit(1); } } else { fprintf(stderr,"File '%s' already exists. Exiting.\n", filename); - exit_program(1); + exit(1); } } } @@ -528,7 +528,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_program(1); + exit(1); } assert_file_overwrite(filename); @@ -536,7 +536,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_program(1); + exit(1); } avio_write(out, st->codec->extradata, st->codec->extradata_size); @@ -558,7 +558,7 @@ static int opt_input_file(void *optctx, const char *opt, 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_program(1); + exit(1); } } @@ -572,7 +572,7 @@ static int opt_input_file(void *optctx, const char *opt, const char *filename) ic = avformat_alloc_context(); if (!ic) { print_error(filename, AVERROR(ENOMEM)); - exit_program(1); + exit(1); } if (o->nb_audio_sample_rate) { snprintf(buf, sizeof(buf), "%d", o->audio_sample_rate[o->nb_audio_sample_rate - 1].u.i); @@ -613,7 +613,7 @@ static int opt_input_file(void *optctx, const char *opt, const char *filename) err = avformat_open_input(&ic, filename, file_iformat, &format_opts); if (err < 0) { print_error(filename, err); - exit_program(1); + exit(1); } assert_avoptions(format_opts); @@ -631,7 +631,7 @@ static int opt_input_file(void *optctx, const char *opt, 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_program(1); + exit(1); } timestamp = o->start_time; @@ -656,7 +656,7 @@ static int opt_input_file(void *optctx, const char *opt, const char *filename) input_files = grow_array(input_files, sizeof(*input_files), &nb_input_files, nb_input_files + 1); if (!(input_files[nb_input_files - 1] = av_mallocz(sizeof(*input_files[0])))) - exit_program(1); + exit(1); input_files[nb_input_files - 1]->ctx = ic; input_files[nb_input_files - 1]->ist_index = nb_input_streams - ic->nb_streams; @@ -691,7 +691,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_program(1); + exit(1); } while ((c = avio_r8(s)) && c != '\n') @@ -758,7 +758,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_program(1); + exit(1); } if (oc->nb_streams - 1 < o->nb_streamid_map) @@ -767,7 +767,7 @@ static OutputStream *new_output_stream(OptionsContext *o, AVFormatContext *oc, e output_streams = grow_array(output_streams, sizeof(*output_streams), &nb_output_streams, nb_output_streams + 1); if (!(ost = av_mallocz(sizeof(*ost)))) - exit_program(1); + exit(1); output_streams[nb_output_streams - 1] = ost; ost->file_index = nb_output_files; @@ -792,7 +792,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_program(1); + exit(1); } *arg++ = 0; av_dict_set(&ost->opts, buf, arg, AV_DICT_DONT_OVERWRITE); @@ -804,7 +804,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_program(1); + exit(1); } ost->max_frames = INT64_MAX; @@ -816,7 +816,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_program(1); + exit(1); } if (bsfc_prev) bsfc_prev->next = bsfc; @@ -862,7 +862,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_program(1); + exit(1); } p++; } @@ -890,13 +890,13 @@ 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_program(1); + exit(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_program(1); + exit(1); } MATCH_PER_STREAM_OPT(frame_aspect_ratios, str, frame_aspect_ratio, oc, st); @@ -906,7 +906,7 @@ static OutputStream *new_video_stream(OptionsContext *o, AVFormatContext *oc) 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)) == PIX_FMT_NONE) { av_log(NULL, AV_LOG_FATAL, "Unknown pixel format requested: %s.\n", frame_pix_fmt); - exit_program(1); + exit(1); } st->sample_aspect_ratio = video_enc->sample_aspect_ratio; @@ -914,7 +914,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_program(1); + exit(1); } parse_matrix_coeffs(video_enc->intra_matrix, intra_matrix); } @@ -922,7 +922,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_program(1); + exit(1); } parse_matrix_coeffs(video_enc->inter_matrix, inter_matrix); } @@ -933,7 +933,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_program(1); + exit(1); } video_enc->rc_override = av_realloc(video_enc->rc_override, @@ -969,7 +969,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_program(1); + exit(1); MATCH_PER_STREAM_OPT(forced_key_frames, str, ost->forced_keyframes, oc, st); if (ost->forced_keyframes) @@ -1011,7 +1011,7 @@ 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_program(1); + exit(1); } MATCH_PER_STREAM_OPT(audio_sample_rate, i, audio_enc->sample_rate, oc, st); @@ -1030,7 +1030,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_program(1); + exit(1); } return ost; @@ -1072,7 +1072,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_program(1); + exit(1); } *p++ = '\0'; idx = parse_number_or_die(opt, idx_str, OPT_INT, 0, INT_MAX); @@ -1133,7 +1133,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_program(1); + exit(1); } ost->source_index = -1; @@ -1145,12 +1145,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_program(1); + exit(1); } if (configure_output_filter(ofilter->graph, ofilter, ofilter->out_tmp) < 0) { av_log(NULL, AV_LOG_FATAL, "Error configuring filter.\n"); - exit_program(1); + exit(1); } avfilter_inout_free(&ofilter->out_tmp); } @@ -1177,7 +1177,7 @@ void opt_output_file(void *optctx, const char *filename) if (configure_complex_filters() < 0) { av_log(NULL, AV_LOG_FATAL, "Error configuring filters.\n"); - exit_program(1); + exit(1); } if (!strcmp(filename, "-")) @@ -1186,21 +1186,21 @@ void opt_output_file(void *optctx, const char *filename) oc = avformat_alloc_context(); if (!oc) { print_error(filename, AVERROR(ENOMEM)); - exit_program(1); + exit(1); } if (o->format) { 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_program(1); + exit(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_program(1); + exit(1); } } @@ -1301,7 +1301,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_program(1); + exit(1); } init_output_filter(ofilter, o, oc); } else { @@ -1315,7 +1315,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_program(1); + exit(1); } ost->source_index = input_files[map->file_index]->ist_index + map->stream_index; @@ -1337,17 +1337,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_program(1); + exit(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_program(1); + exit(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_program(1); + exit(1); } avio_read(pb, attachment, len); @@ -1365,7 +1365,7 @@ loop_end: output_files = grow_array(output_files, sizeof(*output_files), &nb_output_files, nb_output_files + 1); if (!(output_files[nb_output_files - 1] = av_mallocz(sizeof(*output_files[0])))) - exit_program(1); + exit(1); output_files[nb_output_files - 1]->ctx = oc; output_files[nb_output_files - 1]->ost_index = nb_output_streams - oc->nb_streams; @@ -1381,7 +1381,7 @@ loop_end: if (oc->oformat->flags & AVFMT_NEEDNUMBER) { if (!av_filename_number_test(oc->filename)) { print_error(oc->filename, AVERROR(EINVAL)); - exit_program(1); + exit(1); } } @@ -1394,7 +1394,7 @@ loop_end: &oc->interrupt_callback, &output_files[nb_output_files - 1]->opts)) < 0) { print_error(filename, err); - exit_program(1); + exit(1); } } @@ -1415,7 +1415,7 @@ loop_end: continue; 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_program(1); + exit(1); } copy_metadata(o->metadata_map[i].specifier, *p ? p + 1 : p, oc, input_files[in_file_index]->ctx, o); } @@ -1433,7 +1433,7 @@ loop_end: } else { av_log(NULL, AV_LOG_FATAL, "Invalid input file index %d in chapter mapping.\n", o->chapters_input_file); - exit_program(1); + exit(1); } } if (o->chapters_input_file >= 0) @@ -1464,7 +1464,7 @@ loop_end: if (!val) { av_log(NULL, AV_LOG_FATAL, "No '=' character in metadata string %s.\n", o->metadata[i].u.str); - exit_program(1); + exit(1); } *val++ = 0; @@ -1474,7 +1474,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_program(1); + exit(1); } } else { @@ -1485,13 +1485,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_program(1); + exit(1); } m = &oc->chapters[index]->metadata; break; default: av_log(NULL, AV_LOG_FATAL, "Invalid metadata specifier %s.\n", o->metadata[i].specifier); - exit_program(1); + exit(1); } av_dict_set(m, o->metadata[i].u.str, *val ? val : NULL, 0); } @@ -1545,7 +1545,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_program(1); + exit(1); } if (!strcmp(arg, "vcd")) { -- cgit v1.2.3