aboutsummaryrefslogtreecommitdiffstats
path: root/ffmpeg.c
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2012-08-09 04:12:50 +0200
committerMichael Niedermayer <michaelni@gmx.at>2012-08-09 04:12:50 +0200
commit2cdb0810f13b84bcacf864ad8fd28df93d2da8e4 (patch)
treed65e7da3b681a38ddd1d6a220f9fcf9a6786144e /ffmpeg.c
parentb41d481aa4ee6ec916f7bea35dcaf8d35c0a19c1 (diff)
downloadffmpeg-2cdb0810f13b84bcacf864ad8fd28df93d2da8e4.tar.gz
ffmpeg: reduce difference to qatar by a few lines
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'ffmpeg.c')
-rw-r--r--ffmpeg.c7
1 files changed, 4 insertions, 3 deletions
diff --git a/ffmpeg.c b/ffmpeg.c
index cb019b215f..ea90ada0ae 100644
--- a/ffmpeg.c
+++ b/ffmpeg.c
@@ -107,7 +107,6 @@ static void do_video_stats(AVFormatContext *os, OutputStream *ost, int frame_siz
static int64_t getutime(void);
static int run_as_daemon = 0;
-static volatile int received_nb_signals = 0;
static int64_t video_size = 0;
static int64_t audio_size = 0;
static int64_t subtitle_size = 0;
@@ -262,8 +261,10 @@ void term_exit(void)
}
static volatile int received_sigterm = 0;
+static volatile int received_nb_signals = 0;
-static void sigterm_handler(int sig)
+static void
+sigterm_handler(int sig)
{
received_sigterm = sig;
received_nb_signals++;
@@ -411,8 +412,8 @@ void av_noreturn exit_program(int ret)
output_streams[i]->bitstream_filters = NULL;
av_freep(&output_streams[i]->forced_keyframes);
- av_freep(&output_streams[i]->filtered_frame);
av_freep(&output_streams[i]->avfilter);
+ av_freep(&output_streams[i]->filtered_frame);
av_freep(&output_streams[i]);
}
for (i = 0; i < nb_input_files; i++) {