diff options
author | Michael Niedermayer | 2011-10-08 17:28:58 +0200 |
---|---|---|
committer | Michael Niedermayer | 2011-10-08 18:37:47 +0200 |
commit | f3afc9d77227e0e1d0c4e3eda225949cd2f44215 (patch) | |
tree | 89f3f0ffe28d9b5c00d4d17985ba05a44f6f52e5 /ffmpeg.c | |
parent | d6c231bac144b5da5ac460c2ae7a0277747f3b84 (diff) |
ffmpeg: fix run_as_daemon when HAVE_TERMIOS_H is false
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'ffmpeg.c')
-rw-r--r-- | ffmpeg.c | 5 |
1 files changed, 1 insertions, 4 deletions
@@ -564,9 +564,6 @@ static int read_key(void) struct timeval tv; fd_set rfds; - if(run_as_daemon) - return -1; - FD_ZERO(&rfds); FD_SET(0, &rfds); tv.tv_sec = 0; @@ -2452,7 +2449,7 @@ static int transcode(OutputFile *output_files, int nb_output_files, if (received_nb_signals) break; /* read_key() returns 0 on EOF */ - key = read_key(); + key = run_as_daemon ? -1 : read_key(); if (key == 'q') break; if (key == '+') av_log_set_level(av_log_get_level()+10); |