[FFmpeg-cvslog] ffmpeg: fix run_as_daemon when HAVE_TERMIOS_H is false

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Sat Oct  8 17:28:58 2011 +0200| [f3afc9d77227e0e1d0c4e3eda225949cd2f44215] | committer: Michael Niedermayer

ffmpeg: fix run_as_daemon when HAVE_TERMIOS_H is false

Signed-off-by: Michael Niedermayer <michaelni at gmx.at>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=f3afc9d77227e0e1d0c4e3eda225949cd2f44215
---

 ffmpeg.c |    5 +----
 1 files changed, 1 insertions(+), 4 deletions(-)

diff --git a/ffmpeg.c b/ffmpeg.c
index 3633bf8..96503c0 100644
--- a/ffmpeg.c
+++ b/ffmpeg.c
@@ -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);