[FFmpeg-devel] [PATCH 3/3] Replace atexit usage with do_exit function in ffmpeg.c
Stephen Hutchinson
qyot27 at gmail.com
Wed Feb 27 00:59:09 CET 2013
From: d s <avxsynth.testing at gmail.com>
Resolves segfault-at-exit when using the new AviSynth demuxer.
Move most of the rest of the exit calls to do_exit as well for
consistency.
---
ffmpeg.c | 67 +++++++++++++++++++++++++++++++++-----------------------------
1 file changed, 36 insertions(+), 31 deletions(-)
diff --git a/ffmpeg.c b/ffmpeg.c
index 6c3994f..44e1a91 100644
--- a/ffmpeg.c
+++ b/ffmpeg.c
@@ -161,7 +161,6 @@ static struct termios oldtty;
static int restore_tty;
#endif
-
/* sub2video hack:
Convert subtitles to video with alpha to insert them in filter graphs.
This is a temporary solution until libavfilter gets real subtitles support.
@@ -484,18 +483,24 @@ static void exit_program(void)
}
}
+static void do_exit(int status)
+{
+ exit_program();
+ exit(status);
+}
+
void assert_avoptions(AVDictionary *m)
{
AVDictionaryEntry *t;
if ((t = av_dict_get(m, "", NULL, AV_DICT_IGNORE_SUFFIX))) {
av_log(NULL, AV_LOG_FATAL, "Option %s not found.\n", t->key);
- exit(1);
+ do_exit(1);
}
}
static void abort_codec_experimental(AVCodec *c, int encoder)
{
- exit(1);
+ do_exit(1);
}
static void update_benchmark(const char *fmt, ...)
@@ -576,7 +581,7 @@ static void write_frame(AVFormatContext *s, AVPacket *pkt, OutputStream *ost)
avctx->codec ? avctx->codec->name : "copy");
print_error("", a);
if (exit_on_error)
- exit(1);
+ do_exit(1);
}
*pkt = new_pkt;
@@ -598,7 +603,7 @@ static void write_frame(AVFormatContext *s, AVPacket *pkt, OutputStream *ost)
ret = av_interleaved_write_frame(s, pkt);
if (ret < 0) {
print_error("av_interleaved_write_frame()", ret);
- exit(1);
+ do_exit(1);
}
}
@@ -648,7 +653,7 @@ static void do_audio_out(AVFormatContext *s, OutputStream *ost,
update_benchmark(NULL);
if (avcodec_encode_audio2(enc, &pkt, frame, &got_packet) < 0) {
av_log(NULL, AV_LOG_FATAL, "Audio encoding failed (avcodec_encode_audio2)\n");
- exit(1);
+ do_exit(1);
}
update_benchmark("encode_audio %d.%d", ost->file_index, ost->index);
@@ -729,7 +734,7 @@ static void do_subtitle_out(AVFormatContext *s,
if (sub->pts == AV_NOPTS_VALUE) {
av_log(NULL, AV_LOG_ERROR, "Subtitle packets must have a pts\n");
if (exit_on_error)
- exit(1);
+ do_exit(1);
return;
}
@@ -765,7 +770,7 @@ static void do_subtitle_out(AVFormatContext *s,
subtitle_out_max_size, sub);
if (subtitle_out_size < 0) {
av_log(NULL, AV_LOG_FATAL, "Subtitle encoding failed\n");
- exit(1);
+ do_exit(1);
}
av_init_packet(&pkt);
@@ -948,7 +953,7 @@ static void do_video_out(AVFormatContext *s,
update_benchmark("encode_video %d.%d", ost->file_index, ost->index);
if (ret < 0) {
av_log(NULL, AV_LOG_FATAL, "Video encoding failed\n");
- exit(1);
+ do_exit(1);
}
if (got_packet) {
@@ -1007,7 +1012,7 @@ static void do_video_stats(OutputStream *ost, int frame_size)
vstats_file = fopen(vstats_filename, "w");
if (!vstats_file) {
perror("fopen");
- exit(1);
+ do_exit(1);
}
}
@@ -1346,7 +1351,7 @@ static void flush_encoders(void)
update_benchmark("flush %s %d.%d", desc, ost->file_index, ost->index);
if (ret < 0) {
av_log(NULL, AV_LOG_FATAL, "%s encoding failed\n", desc);
- exit(1);
+ do_exit(1);
}
*size += pkt.size;
if (ost->logfile && enc->stats_out) {
@@ -1552,7 +1557,7 @@ static int decode_audio(InputStream *ist, AVPacket *pkt, int *got_output)
av_log(NULL, AV_LOG_FATAL, "Unable to find default channel "
"layout for Input Stream #%d.%d\n", ist->file_index,
ist->st->index);
- exit(1);
+ do_exit(1);
}
decoded_frame->channel_layout = avctx->channel_layout;
@@ -1580,7 +1585,7 @@ static int decode_audio(InputStream *ist, AVPacket *pkt, int *got_output)
int j;
if (configure_filtergraph(fg) < 0) {
av_log(NULL, AV_LOG_FATAL, "Error reinitializing filters!\n");
- exit(1);
+ do_exit(1);
}
for (j = 0; j < fg->nb_outputs; j++) {
OutputStream *ost = fg->outputs[j]->ost;
@@ -1690,7 +1695,7 @@ static int decode_video(InputStream *ist, AVPacket *pkt, int *got_output)
if (ist_in_filtergraph(filtergraphs[i], ist) && ist->reinit_filters &&
configure_filtergraph(filtergraphs[i]) < 0) {
av_log(NULL, AV_LOG_FATAL, "Error reinitializing filters!\n");
- exit(1);
+ do_exit(1);
}
}
}
@@ -1724,7 +1729,7 @@ static int decode_video(InputStream *ist, AVPacket *pkt, int *got_output)
} else
if(av_buffersrc_add_frame(ist->filters[i]->filter, decoded_frame, AV_BUFFERSRC_FLAG_PUSH)<0) {
av_log(NULL, AV_LOG_FATAL, "Failed to inject frame into filter network\n");
- exit(1);
+ do_exit(1);
}
}
@@ -1923,7 +1928,7 @@ static void print_sdp(void)
AVFormatContext **avc = av_malloc(sizeof(*avc) * nb_output_files);
if (!avc)
- exit(1);
+ do_exit(1);
for (i = 0; i < nb_output_files; i++)
avc[i] = output_files[i]->ctx;
@@ -1999,7 +2004,7 @@ static void parse_forced_key_frames(char *kf, OutputStream *ost,
pts = av_malloc(sizeof(*pts) * size);
if (!pts) {
av_log(NULL, AV_LOG_FATAL, "Could not allocate forced key frames array.\n");
- exit(1);
+ do_exit(1);
}
p = kf;
@@ -2019,7 +2024,7 @@ static void parse_forced_key_frames(char *kf, OutputStream *ost,
sizeof(*pts)))) {
av_log(NULL, AV_LOG_FATAL,
"Could not allocate forced key frames array.\n");
- exit(1);
+ do_exit(1);
}
t = p[8] ? parse_time_or_die("force_key_frames", p + 8, 1) : 0;
t = av_rescale_q(t, AV_TIME_BASE_Q, avctx->time_base);
@@ -2204,7 +2209,7 @@ static int transcode_init(void)
case AVMEDIA_TYPE_AUDIO:
if (audio_volume != 256) {
av_log(NULL, AV_LOG_FATAL, "-acodec copy and -vol are incompatible (frames are not decoded)\n");
- exit(1);
+ do_exit(1);
}
codec->channel_layout = icodec->channel_layout;
codec->sample_rate = icodec->sample_rate;
@@ -2263,7 +2268,7 @@ static int transcode_init(void)
fg = init_simple_filtergraph(ist, ost);
if (configure_filtergraph(fg)) {
av_log(NULL, AV_LOG_FATAL, "Error opening filters!\n");
- exit(1);
+ do_exit(1);
}
}
@@ -2365,7 +2370,7 @@ static int transcode_init(void)
if (cmdutils_read_file(logfilename, &logbuffer, &logbuffer_size) < 0) {
av_log(NULL, AV_LOG_FATAL, "Error reading log file '%s' for pass-2 encoding\n",
logfilename);
- exit(1);
+ do_exit(1);
}
codec->stats_in = logbuffer;
}
@@ -2374,7 +2379,7 @@ static int transcode_init(void)
if (!f) {
av_log(NULL, AV_LOG_FATAL, "Cannot write log file '%s' for pass-1 encoding: %s\n",
logfilename, strerror(errno));
- exit(1);
+ do_exit(1);
}
ost->logfile = f;
}
@@ -2846,7 +2851,7 @@ static int process_input(int file_index)
if (ret != AVERROR_EOF) {
print_error(is->filename, ret);
if (exit_on_error)
- exit(1);
+ do_exit(1);
}
ifile->eof_reached = 1;
@@ -2997,7 +3002,7 @@ static int process_input(int file_index)
av_log(NULL, AV_LOG_ERROR, "Error while decoding stream #%d:%d: %s\n",
ist->file_index, ist->st->index, buf);
if (exit_on_error)
- exit(1);
+ do_exit(1);
}
discard_packet:
@@ -3264,7 +3269,7 @@ int main(int argc, char **argv)
int ret;
int64_t ti;
- atexit(exit_program);
+ //atexit(exit_program);
setvbuf(stderr,NULL,_IONBF,0); /* win32 runtime needs this */
@@ -3293,34 +3298,34 @@ int main(int argc, char **argv)
/* parse options and open all input/output files */
ret = ffmpeg_parse_options(argc, argv);
if (ret < 0)
- exit(1);
+ do_exit(1);
if (nb_output_files <= 0 && nb_input_files == 0) {
show_usage();
av_log(NULL, AV_LOG_WARNING, "Use -h to get full help or, even better, run 'man %s'\n", program_name);
- exit(1);
+ do_exit(1);
}
/* file converter / grab */
if (nb_output_files <= 0) {
av_log(NULL, AV_LOG_FATAL, "At least one output file must be specified\n");
- exit(1);
+ do_exit(1);
}
// if (nb_input_files == 0) {
// av_log(NULL, AV_LOG_FATAL, "At least one input file must be specified\n");
-// exit(1);
+// do_exit(1);
// }
current_time = ti = getutime();
if (transcode() < 0)
- exit(1);
+ do_exit(1);
ti = getutime() - ti;
if (do_benchmark) {
int maxrss = getmaxrss() / 1024;
printf("bench: utime=%0.3fs maxrss=%ikB\n", ti / 1000000.0, maxrss);
}
- exit(received_nb_signals ? 255 : 0);
+ do_exit(received_nb_signals ? 255 : 0);
return 0;
}
--
1.7.10.4
More information about the ffmpeg-devel
mailing list