diff options
author | Michael Niedermayer <michaelni@gmx.at> | 2011-10-08 17:21:25 +0200 |
---|---|---|
committer | Michael Niedermayer <michaelni@gmx.at> | 2011-10-08 18:37:47 +0200 |
commit | d6c231bac144b5da5ac460c2ae7a0277747f3b84 (patch) | |
tree | 8aaa9666a44b04bc8ce1b44b76811b8430884ebd /ffmpeg.c | |
parent | 0732dceef1954ad358782d5c1286ac9527f0cef6 (diff) | |
download | ffmpeg-d6c231bac144b5da5ac460c2ae7a0277747f3b84.tar.gz |
ffmpeg: cosmetic renamings to reduce difference to qatar.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'ffmpeg.c')
-rw-r--r-- | ffmpeg.c | 8 |
1 files changed, 4 insertions, 4 deletions
@@ -146,7 +146,7 @@ static int audio_volume = 256; static int exit_on_error = 0; static int using_stdin = 0; static int run_as_daemon = 0; -static volatile int q_pressed = 0; +static volatile int received_nb_signals = 0; static int64_t video_size = 0; static int64_t audio_size = 0; static int64_t extra_size = 0; @@ -520,7 +520,7 @@ static volatile int received_sigterm = 0; static void sigterm_handler(int sig) { received_sigterm = sig; - q_pressed++; + received_nb_signals++; term_exit(); } @@ -626,7 +626,7 @@ static int read_yn(void) static int decode_interrupt_cb(void) { - return q_pressed > 1; + return received_nb_signals > 1; } void exit_program(int ret) @@ -2449,7 +2449,7 @@ static int transcode(OutputFile *output_files, int nb_output_files, opts_min= 1e100; /* if 'q' pressed, exits */ if (!using_stdin) { - if (q_pressed) + if (received_nb_signals) break; /* read_key() returns 0 on EOF */ key = read_key(); |