Chiebot-Mirror
/
FFmpeg
mirror of https://github.com/FFmpeg/FFmpeg.git
8
0
Fork 0
Code Issues Projects Releases Wiki Activity

cmdutils: move exit_program() declaration to cmdutils from avconv

Browse Source 
Allows cmdutils to call each tool's own cleanup function.
pull/2/head
Anton Khirnov 14 years ago
parent 346ea9e222
commit dad09ff93f
7 changed files with 105 additions and 83 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 6
      avconv.c
  2. 5
      avplay.c
  3. 5
      avprobe.c
  4. 5
      avserver.c
  5. 15
      cmdutils.c
  6. 6
      cmdutils.h
  7. 146
      ffmpeg.c

6
avconv.c
Unescape View File

@ -433,7 +433,7 @@ static int decode_interrupt_cb(void)
return received_nb_signals > 1;
}
static int exit_program(int ret)
void exit_program(int ret)
{
int i;
@ -483,7 +483,6 @@ static int exit_program(int ret)
}
exit(ret); /* not all OS-es handle main() return value */
return ret;
}
static void assert_avoptions(AVDictionary *m)
@ -4192,5 +4191,6 @@ int main(int argc, char **argv)
printf("bench: utime=%0.3fs maxrss=%ikB\n", ti / 1000000.0, maxrss);
}
return exit_program(0);
exit_program(0);
return 0;
}

5
avplay.c
Unescape View File

@ -278,6 +278,11 @@ static AVPacket flush_pkt;
static SDL_Surface *screen;
void exit_program(int ret)
{
exit(ret);
}
static int packet_queue_put(PacketQueue *q, AVPacket *pkt);
/* packet queue handling */

5
avprobe.c
Unescape View File

@ -56,6 +56,11 @@ static const char *unit_hertz_str = "Hz" ;
static const char *unit_byte_str = "byte" ;
static const char *unit_bit_per_second_str = "bit/s";
void exit_program(int ret)
{
exit(ret);
}
static char *value_string(char *buf, int buf_size, double val, const char *unit)
{
if (unit == unit_second_str && use_value_sexagesimal_format) {

5
avserver.c
Unescape View File

@ -320,6 +320,11 @@ static AVLFG random_state;
static FILE *logfile = NULL;
void exit_program(int ret)
{
exit(ret);
}
/* FIXME: make avserver work with IPv6 */
/* resolve host with also IP address parsing */
static int resolve_host(struct in_addr *sin_addr, const char *hostname)

15
cmdutils.c
Unescape View File

@ -92,7 +92,8 @@ double parse_number_or_die(const char *context, const char *numstr, int type, do
else
return d;
fprintf(stderr, error, context, numstr, min, max);
exit(1);
exit_program(1);
return 0;
}
int64_t parse_time_or_die(const char *context, const char *timestr, int is_duration)
@ -101,7 +102,7 @@ int64_t parse_time_or_die(const char *context, const char *timestr, int is_durat
if (av_parse_time(&us, timestr, is_duration) < 0) {
fprintf(stderr, "Invalid %s specification for %s: %s\n",
is_duration ? "duration" : "date", context, timestr);
exit(1);
exit_program(1);
}
return us;
}
@ -237,14 +238,14 @@ void parse_options(int argc, char **argv, const OptionDef *options,
if (!po->name) {
unknown_opt:
fprintf(stderr, "%s: unrecognized option '%s'\n", argv[0], opt);
exit(1);
exit_program(1);
}
arg = NULL;
if (po->flags & HAS_ARG) {
arg = argv[optindex++];
if (!arg) {
fprintf(stderr, "%s: missing argument for option '%s'\n", argv[0], opt);
exit(1);
exit_program(1);
}
}
if (po->flags & OPT_STRING) {
@ -262,11 +263,11 @@ unknown_opt:
} else if (po->u.func_arg) {
if (po->u.func_arg(opt, arg) < 0) {
fprintf(stderr, "%s: failed to set value '%s' for option '%s'\n", argv[0], arg, opt);
exit(1);
exit_program(1);
}
}
if(po->flags & OPT_EXIT)
exit(0);
exit_program(0);
} else {
if (parse_arg_function)
parse_arg_function(opt);
@ -336,7 +337,7 @@ int opt_loglevel(const char *opt, const char *arg)
"Possible levels are numbers or:\n", arg);
for (i = 0; i < FF_ARRAY_ELEMS(log_levels); i++)
fprintf(stderr, "\"%s\"\n", log_levels[i].name);
exit(1);
exit_program(1);
}
av_log_set_level(level);
return 0;

6
cmdutils.h
Unescape View File

@ -327,4 +327,10 @@ extern AVFilter ffsink;
int get_filtered_video_frame(AVFilterContext *sink, AVFrame *frame,
AVFilterBufferRef **picref, AVRational *pts_tb);
/**
* Do all the necessary cleanup and abort.
* This function is implemented in the avtools, not cmdutils.
*/
void exit_program(int ret);
#endif /* LIBAV_CMDUTILS_H */

146
ffmpeg.c
Unescape View File

@ -445,7 +445,7 @@ static int decode_interrupt_cb(void)
return received_nb_signals > 1;
}
static int ffmpeg_exit(int ret)
void exit_program(int ret)
{
int i;
@ -501,7 +501,6 @@ static int ffmpeg_exit(int ret)
}
exit(ret); /* not all OS-es handle main() return value */
return ret;
}
static void assert_avoptions(AVDictionary *m)
@ -509,7 +508,7 @@ static void assert_avoptions(AVDictionary *m)
AVDictionaryEntry *t;
if ((t = av_dict_get(m, "", NULL, AV_DICT_IGNORE_SUFFIX))) {
av_log(NULL, AV_LOG_ERROR, "Option %s not found.\n", t->key);
ffmpeg_exit(1);
exit_program(1);
}
}
@ -526,7 +525,7 @@ static void assert_codec_experimental(AVCodecContext *c, int encoder)
if (!(codec->capabilities & CODEC_CAP_EXPERIMENTAL))
av_log(NULL, AV_LOG_ERROR, "Or use the non experimental %s '%s'.\n",
codec_string, codec->name);
ffmpeg_exit(1);
exit_program(1);
}
}
@ -535,13 +534,13 @@ static void *grow_array(void *array, int elem_size, int *size, int new_size)
{
if (new_size >= INT_MAX / elem_size) {
fprintf(stderr, "Array too big.\n");
ffmpeg_exit(1);
exit_program(1);
}
if (*size < new_size) {
uint8_t *tmp = av_realloc(array, new_size*elem_size);
if (!tmp) {
fprintf(stderr, "Could not alloc buffer.\n");
ffmpeg_exit(1);
exit_program(1);
}
memset(tmp + *size*elem_size, 0, (new_size-*size) * elem_size);
*size = new_size;
@ -664,7 +663,7 @@ static OutputStream *new_output_stream(AVFormatContext *oc, int file_idx, AVCode
if (!st) {
av_log(NULL, AV_LOG_ERROR, "Could not alloc stream.\n");
ffmpeg_exit(1);
exit_program(1);
}
output_streams_for_file[file_idx] =
@ -676,7 +675,7 @@ static OutputStream *new_output_stream(AVFormatContext *oc, int file_idx, AVCode
av_mallocz(sizeof(OutputStream));
if (!ost) {
fprintf(stderr, "Could not alloc output stream\n");
ffmpeg_exit(1);
exit_program(1);
}
ost->file_index = file_idx;
ost->index = idx;
@ -756,7 +755,7 @@ static void write_frame(AVFormatContext *s, AVPacket *pkt, AVCodecContext *avctx
avctx->codec ? avctx->codec->name : "copy");
print_error("", a);
if (exit_on_error)
ffmpeg_exit(1);
exit_program(1);
}
*pkt= new_pkt;
@ -766,7 +765,7 @@ static void write_frame(AVFormatContext *s, AVPacket *pkt, AVCodecContext *avctx
ret= av_interleaved_write_frame(s, pkt);
if(ret < 0){
print_error("av_interleaved_write_frame()", ret);
ffmpeg_exit(1);
exit_program(1);
}
}
@ -802,14 +801,14 @@ need_realloc:
if(audio_out_size > INT_MAX || audio_buf_size > INT_MAX){
fprintf(stderr, "Buffer sizes too large\n");
ffmpeg_exit(1);
exit_program(1);
}
av_fast_malloc(&audio_buf, &allocated_audio_buf_size, audio_buf_size);
av_fast_malloc(&audio_out, &allocated_audio_out_size, audio_out_size);
if (!audio_buf || !audio_out){
fprintf(stderr, "Out of memory in do_audio_out\n");
ffmpeg_exit(1);
exit_program(1);
}
if (enc->channels != dec->channels || enc->sample_rate != dec->sample_rate)
@ -849,7 +848,7 @@ need_realloc:
fprintf(stderr, "Can not resample %d channels @ %d Hz to %d channels @ %d Hz\n",
dec->channels, dec->sample_rate,
enc->channels, enc->sample_rate);
ffmpeg_exit(1);
exit_program(1);
}
}
}
@ -865,7 +864,7 @@ need_realloc:
fprintf(stderr, "Cannot convert %s sample format to %s sample format\n",
av_get_sample_fmt_name(dec->sample_fmt),
av_get_sample_fmt_name(enc->sample_fmt));
ffmpeg_exit(1);
exit_program(1);
}
ost->reformat_pair=MAKE_SFMT_PAIR(enc->sample_fmt,dec->sample_fmt);
}
@ -938,7 +937,7 @@ need_realloc:
if (av_audio_convert(ost->reformat_ctx, obuf, ostride, ibuf, istride, len)<0) {
printf("av_audio_convert() failed\n");
if (exit_on_error)
ffmpeg_exit(1);
exit_program(1);
return;
}
buftmp = audio_buf;
@ -950,7 +949,7 @@ need_realloc:
/* output resampled raw samples */
if (av_fifo_realloc2(ost->fifo, av_fifo_size(ost->fifo) + size_out) < 0) {
fprintf(stderr, "av_fifo_realloc2() failed\n");
ffmpeg_exit(1);
exit_program(1);
}
av_fifo_generic_write(ost->fifo, buftmp, size_out, NULL);
@ -968,7 +967,7 @@ need_realloc:
(short *)audio_buf);
if (ret < 0) {
fprintf(stderr, "Audio encoding failed\n");
ffmpeg_exit(1);
exit_program(1);
}
audio_size += ret;
pkt.stream_index= ost->index;
@ -995,7 +994,7 @@ need_realloc:
if(size_out > audio_out_size){
fprintf(stderr, "Internal error, buffer size too small\n");
ffmpeg_exit(1);
exit_program(1);
}
//FIXME pass ost->sync_opts as AVFrame.pts in avcodec_encode_audio()
@ -1003,7 +1002,7 @@ need_realloc:
(short *)buftmp);
if (ret < 0) {
fprintf(stderr, "Audio encoding failed\n");
ffmpeg_exit(1);
exit_program(1);
}
audio_size += ret;
pkt.stream_index= ost->index;
@ -1073,7 +1072,7 @@ static void do_subtitle_out(AVFormatContext *s,
if (pts == AV_NOPTS_VALUE) {
fprintf(stderr, "Subtitle packets must have a pts\n");
if (exit_on_error)
ffmpeg_exit(1);
exit_program(1);
return;
}
@ -1101,7 +1100,7 @@ static void do_subtitle_out(AVFormatContext *s,
subtitle_out_max_size, sub);
if (subtitle_out_size < 0) {
fprintf(stderr, "Subtitle encoding failed\n");
ffmpeg_exit(1);
exit_program(1);
}
av_init_packet(&pkt);
@ -1188,7 +1187,7 @@ static void do_video_out(AVFormatContext *s,
ost->resample_width, ost->resample_height, av_get_pix_fmt_name(ost->resample_pix_fmt),
dec->width , dec->height , av_get_pix_fmt_name(dec->pix_fmt));
if(!ost->video_resample)
ffmpeg_exit(1);
exit_program(1);
}
#if !CONFIG_AVFILTER
@ -1207,7 +1206,7 @@ static void do_video_out(AVFormatContext *s,
ost->sws_flags, NULL, NULL, NULL);
if (ost->img_resample_ctx == NULL) {
fprintf(stderr, "Cannot get resampling context\n");
ffmpeg_exit(1);
exit_program(1);
}
}
sws_scale(ost->img_resample_ctx, formatted_picture->data, formatted_picture->linesize,
@ -1267,7 +1266,7 @@ static void do_video_out(AVFormatContext *s,
&big_picture);
if (ret < 0) {
fprintf(stderr, "Video encoding failed\n");
ffmpeg_exit(1);
exit_program(1);
}
if(ret>0){
@ -1313,7 +1312,7 @@ static void do_video_stats(AVFormatContext *os, OutputStream *ost,
vstats_file = fopen(vstats_filename, "w");
if (!vstats_file) {
perror("fopen");
ffmpeg_exit(1);
exit_program(1);
}
}
@ -1818,7 +1817,7 @@ static int output_packet(InputStream *ist, int ist_index,
} else { /* pad */
int frame_bytes = enc->frame_size*osize*enc->channels;
if (allocated_audio_buf_size < frame_bytes)
ffmpeg_exit(1);
exit_program(1);
generate_silence(audio_buf+fifo_bytes, enc->sample_fmt, frame_bytes - fifo_bytes);
}
@ -1832,7 +1831,7 @@ static int output_packet(InputStream *ist, int ist_index,
}
if (ret < 0) {
fprintf(stderr, "Audio encoding failed\n");
ffmpeg_exit(1);
exit_program(1);
}
audio_size += ret;
pkt.flags |= AV_PKT_FLAG_KEY;
@ -1841,7 +1840,7 @@ static int output_packet(InputStream *ist, int ist_index,
ret = avcodec_encode_video(enc, bit_buffer, bit_buffer_size, NULL);
if (ret < 0) {
fprintf(stderr, "Video encoding failed\n");
ffmpeg_exit(1);
exit_program(1);
}
video_size += ret;
if(enc->coded_frame && enc->coded_frame->key_frame)
@ -1933,7 +1932,7 @@ static void parse_forced_key_frames(char *kf, OutputStream *ost,
ost->forced_kf_pts = av_malloc(sizeof(*ost->forced_kf_pts) * n);
if (!ost->forced_kf_pts) {
av_log(NULL, AV_LOG_FATAL, "Could not allocate forced key frames array.\n");
ffmpeg_exit(1);
exit_program(1);
}
for (i = 0; i < n; i++) {
p = i ? strchr(p, ',') + 1 : kf;
@ -2024,7 +2023,7 @@ static int transcode(AVFormatContext **output_files,
fprintf(stderr, "Codec type mismatch for mapping #%d.%d -> #%d.%d\n",
stream_maps[n].file_index, stream_maps[n].stream_index,
ost->file_index, ost->index);
ffmpeg_exit(1);
exit_program(1);
}
} else {
@ -2074,7 +2073,7 @@ static int transcode(AVFormatContext **output_files,
av_dump_format(output_files[i], i, output_files[i]->filename, 1);
fprintf(stderr, "Could not find input stream matching output stream #%d.%d\n",
ost->file_index, ost->index);
ffmpeg_exit(1);
exit_program(1);
}
}
}
@ -2139,7 +2138,7 @@ static int transcode(AVFormatContext **output_files,
case AVMEDIA_TYPE_AUDIO:
if(audio_volume != 256) {
fprintf(stderr,"-acodec copy and -vol are incompatible (frames are not decoded)\n");
ffmpeg_exit(1);
exit_program(1);
}
codec->channel_layout = icodec->channel_layout;
codec->sample_rate = icodec->sample_rate;
@ -2213,7 +2212,7 @@ static int transcode(AVFormatContext **output_files,
if (ost->st->codec->pix_fmt == PIX_FMT_NONE) {
fprintf(stderr, "Video pixel format is unknown, stream cannot be encoded\n");
ffmpeg_exit(1);
exit_program(1);
}
if (!codec->width || !codec->height) {
@ -2230,7 +2229,7 @@ static int transcode(AVFormatContext **output_files,
if(avpicture_alloc((AVPicture*)&ost->pict_tmp, codec->pix_fmt,
codec->width, codec->height)) {
fprintf(stderr, "Cannot allocate temp picture, check pix fmt\n");
ffmpeg_exit(1);
exit_program(1);
}
ost->img_resample_ctx = sws_getContext(
icodec->width,
@ -2242,7 +2241,7 @@ static int transcode(AVFormatContext **output_files,
ost->sws_flags, NULL, NULL, NULL);
if (ost->img_resample_ctx == NULL) {
fprintf(stderr, "Cannot get resampling context\n");
ffmpeg_exit(1);
exit_program(1);
}
#endif
codec->bits_per_raw_sample= 0;
@ -2290,7 +2289,7 @@ static int transcode(AVFormatContext **output_files,
f = fopen(logfilename, "wb");
if (!f) {
fprintf(stderr, "Cannot write log file '%s' for pass-1 encoding: %s\n", logfilename, strerror(errno));
ffmpeg_exit(1);
exit_program(1);
}
ost->logfile = f;
} else {
@ -2298,7 +2297,7 @@ static int transcode(AVFormatContext **output_files,
size_t logbuffer_size;
if (read_file(logfilename, &logbuffer, &logbuffer_size) < 0) {
fprintf(stderr, "Error reading log file '%s' for pass-2 encoding\n", logfilename);
ffmpeg_exit(1);
exit_program(1);
}
codec->stats_in = logbuffer;
}
@ -2670,7 +2669,7 @@ static int transcode(AVFormatContext **output_files,
fprintf(stderr, "Error while decoding stream #%d.%d\n",
ist->file_index, ist->st->index);
if (exit_on_error)
ffmpeg_exit(1);
exit_program(1);
av_free_packet(&pkt);
goto redo;
}
@ -2785,7 +2784,7 @@ static int opt_frame_rate(const char *opt, const char *arg)
{
if (av_parse_video_rate(&frame_rate, arg) < 0) {
fprintf(stderr, "Incorrect value for %s: %s\n", opt, arg);
ffmpeg_exit(1);
exit_program(1);
}
return 0;
}
@ -2820,7 +2819,7 @@ static int opt_frame_pix_fmt(const char *opt, const char *arg)
}
} else {
show_pix_fmts();
ffmpeg_exit(0);
exit_program(0);
}
return 0;
}
@ -2856,7 +2855,7 @@ static int opt_metadata(const char *opt, const char *arg)
if(!mid){
fprintf(stderr, "Missing =\n");
ffmpeg_exit(1);
exit_program(1);
}
*mid++= 0;
@ -2904,7 +2903,7 @@ static int opt_audio_sample_fmt(const char *opt, const char *arg)
char fmt_str[128];
for (i = -1; i < AV_SAMPLE_FMT_NB; i++)
printf("%s\n", av_get_sample_fmt_string(fmt_str, sizeof(fmt_str), i));
ffmpeg_exit(0);
exit_program(0);
}
return 0;
}
@ -3026,7 +3025,7 @@ static void parse_meta_type(char *arg, char *type, int *index, char **endptr)
break;
default:
fprintf(stderr, "Invalid metadata type %c.\n", *arg);
ffmpeg_exit(1);
exit_program(1);
}
} else
*type = 'g';
@ -3142,11 +3141,11 @@ static enum CodecID find_codec_or_die(const char *name, int type, int encoder)
avcodec_find_decoder_by_name(name);
if(!codec) {
fprintf(stderr, "Unknown %s '%s'\n", codec_string, name);
ffmpeg_exit(1);
exit_program(1);
}
if(codec->type != type) {
fprintf(stderr, "Invalid %s type '%s'\n", codec_string, name);
ffmpeg_exit(1);
exit_program(1);
}
return codec->id;
}
@ -3164,7 +3163,7 @@ static int opt_input_file(const char *opt, const char *filename)
if (last_asked_format) {
if (!(file_iformat = av_find_input_format(last_asked_format))) {
fprintf(stderr, "Unknown input format: '%s'\n", last_asked_format);
ffmpeg_exit(1);
exit_program(1);
}
last_asked_format = NULL;
}
@ -3179,7 +3178,7 @@ static int opt_input_file(const char *opt, const char *filename)
ic = avformat_alloc_context();
if (!ic) {
print_error(filename, AVERROR(ENOMEM));
ffmpeg_exit(1);
exit_program(1);
}
if (audio_sample_rate) {
snprintf(buf, sizeof(buf), "%d", audio_sample_rate);
@ -3212,7 +3211,7 @@ static int opt_input_file(const char *opt, const char *filename)
err = avformat_open_input(&ic, filename, file_iformat, &format_opts);
if (err < 0) {
print_error(filename, err);
ffmpeg_exit(1);
exit_program(1);
}
assert_avoptions(format_opts);
@ -3235,7 +3234,7 @@ static int opt_input_file(const char *opt, const char *filename)
}
if(!found){
fprintf(stderr, "Specified program id not found\n");
ffmpeg_exit(1);
exit_program(1);
}
opt_programid=0;
}
@ -3255,7 +3254,7 @@ static int opt_input_file(const char *opt, const char *filename)
if (ret < 0 && verbose >= 0) {
fprintf(stderr, "%s: could not find codec parameters\n", filename);
av_close_input_file(ic);
ffmpeg_exit(1);
exit_program(1);
}
timestamp = start_time;
@ -3491,7 +3490,7 @@ static void new_video_stream(AVFormatContext *oc, int file_idx)
int e=sscanf(p, "%d,%d,%d", &start, &end, &q);
if(e!=3){
fprintf(stderr, "error parsing rc_override\n");
ffmpeg_exit(1);
exit_program(1);
}
video_enc->rc_override=
av_realloc(video_enc->rc_override,
@ -3615,7 +3614,7 @@ static void new_data_stream(AVFormatContext *oc, int file_idx)
data_enc = st->codec;
if (!data_stream_copy) {
fprintf(stderr, "Data stream encoding not supported yet (only streamcopy)\n");
ffmpeg_exit(1);
exit_program(1);
}
data_enc->codec_type = AVMEDIA_TYPE_DATA;
@ -3689,7 +3688,7 @@ static int opt_new_stream(const char *opt, const char *arg)
int file_idx = nb_output_files - 1;
if (nb_output_files <= 0) {
fprintf(stderr, "At least one output file must be specified\n");
ffmpeg_exit(1);
exit_program(1);
}
oc = output_files[file_idx];
@ -3714,7 +3713,7 @@ static int opt_streamid(const char *opt, const char *arg)
fprintf(stderr,
"Invalid value '%s' for option '%s', required syntax is 'index:value'\n",
arg, opt);
ffmpeg_exit(1);
exit_program(1);
}
*p++ = '\0';
idx = parse_number_or_die(opt, idx_str, OPT_INT, 0, INT_MAX);
@ -3736,14 +3735,14 @@ static void opt_output_file(const char *filename)
oc = avformat_alloc_context();
if (!oc) {
print_error(filename, AVERROR(ENOMEM));
ffmpeg_exit(1);
exit_program(1);
}
if (last_asked_format) {
file_oformat = av_guess_format(last_asked_format, NULL, NULL);
if (!file_oformat) {
fprintf(stderr, "Requested output format '%s' is not a suitable output format\n", last_asked_format);
ffmpeg_exit(1);
exit_program(1);
}
last_asked_format = NULL;
} else {
@ -3751,7 +3750,7 @@ static void opt_output_file(const char *filename)
if (!file_oformat) {
fprintf(stderr, "Unable to find a suitable output format for '%s'\n",
filename);
ffmpeg_exit(1);
exit_program(1);
}
}
@ -3765,7 +3764,7 @@ static void opt_output_file(const char *filename)
int err = read_avserver_streams(oc, filename);
if (err < 0) {
print_error(filename, err);
ffmpeg_exit(1);
exit_program(1);
}
} else {
use_video = file_oformat->video_codec != CODEC_ID_NONE || video_stream_copy || video_codec_name;
@ -3810,7 +3809,7 @@ static void opt_output_file(const char *filename)
if (oc->oformat->flags & AVFMT_NEEDNUMBER) {
if (!av_filename_number_test(oc->filename)) {
print_error(oc->filename, AVERROR(EINVAL));
ffmpeg_exit(1);
exit_program(1);
}
}
@ -3826,12 +3825,12 @@ static void opt_output_file(const char *filename)
fflush(stderr);
if (!read_yesno()) {
fprintf(stderr, "Not overwriting - exiting\n");
ffmpeg_exit(1);
exit_program(1);
}
}
else {
fprintf(stderr,"File '%s' already exists. Exiting.\n", filename);
ffmpeg_exit(1);
exit_program(1);
}
}
}
@ -3839,7 +3838,7 @@ static void opt_output_file(const char *filename)
/* open the file */
if ((err = avio_open(&oc->pb, filename, AVIO_FLAG_WRITE)) < 0) {
print_error(filename, err);
ffmpeg_exit(1);
exit_program(1);
}
}
@ -3917,7 +3916,7 @@ static void parse_matrix_coeffs(uint16_t *dest, const char *str)
p = strchr(p, ',');
if(!p) {
fprintf(stderr, "Syntax error in matrix \"%s\" at coeff %d\n", str, i);
ffmpeg_exit(1);
exit_program(1);
}
p++;
}
@ -4065,7 +4064,7 @@ static int opt_target(const char *opt, const char *arg)
fprintf(stderr, "Could not determine norm (PAL/NTSC/NTSC-Film) for target.\n");
fprintf(stderr, "Please prefix target with \"pal-\", \"ntsc-\" or \"film-\",\n");
fprintf(stderr, "or set a framerate with \"-r xxx\".\n");
ffmpeg_exit(1);
exit_program(1);
}
if(!strcmp(arg, "vcd")) {
@ -4182,7 +4181,7 @@ static int opt_bsf(const char *opt, const char *arg)
if(!bsfc){
fprintf(stderr, "Unknown bitstream filter %s\n", arg);
ffmpeg_exit(1);
exit_program(1);
}
bsfp= *opt == 'v' ? &video_bitstream_filters :
@ -4206,7 +4205,7 @@ static int opt_preset(const char *opt, const char *arg)
if (!(f = get_preset_file(filename, sizeof(filename), arg, *opt == 'f', codec_name))) {
fprintf(stderr, "File for preset '%s' not found\n", arg);
ffmpeg_exit(1);
exit_program(1);
}
while(!feof(f)){
@ -4216,7 +4215,7 @@ static int opt_preset(const char *opt, const char *arg)
e|= sscanf(line, "%999[^=]=%999[^\n]\n", tmp, tmp2) - 2;
if(e){
fprintf(stderr, "%s: Invalid syntax: '%s'\n", filename, line);
ffmpeg_exit(1);
exit_program(1);
}
if(!strcmp(tmp, "acodec")){
opt_audio_codec(tmp, tmp2);
@ -4228,7 +4227,7 @@ static int opt_preset(const char *opt, const char *arg)
opt_data_codec(tmp, tmp2);
}else if(opt_default(tmp, tmp2) < 0){
fprintf(stderr, "%s: Invalid option or argument: '%s', parsed as '%s' = '%s'\n", filename, line, tmp, tmp2);
ffmpeg_exit(1);
exit_program(1);
}
}
@ -4402,29 +4401,30 @@ int main(int argc, char **argv)
if(nb_output_files <= 0 && nb_input_files == 0) {
show_usage();
fprintf(stderr, "Use -h to get full help or, even better, run 'man ffmpeg'\n");
ffmpeg_exit(1);
exit_program(1);
}
/* file converter / grab */
if (nb_output_files <= 0) {
fprintf(stderr, "At least one output file must be specified\n");
ffmpeg_exit(1);
exit_program(1);
}
if (nb_input_files == 0) {
fprintf(stderr, "At least one input file must be specified\n");
ffmpeg_exit(1);
exit_program(1);
}
ti = getutime();
if (transcode(output_files, nb_output_files, input_files, nb_input_files,
stream_maps, nb_stream_maps) < 0)
ffmpeg_exit(1);
exit_program(1);
ti = getutime() - ti;
if (do_benchmark) {
int maxrss = getmaxrss() / 1024;
printf("bench: utime=%0.3fs maxrss=%ikB\n", ti / 1000000.0, maxrss);
}
return ffmpeg_exit(0);
exit_program(0);
return 0;
}

Write Preview
Loading…
Cancel
Save