virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-11-21 10:55:51 +02:00
Code Issues Releases Activity

ffmpeg: call term_init() earlier

Browse Source 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer 2011-10-08 17:20:52 +02:00
parent 570fb660d6
commit 0732dceef1
1 changed files with 17 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
ffmpeg.c
View File

@ -612,6 +612,18 @@ static int read_key(void)
return -1; return -1;
} }
static int read_yn(void)
{
int c;
#if HAVE_TERMIOS_H || HAVE_KBHIT
while((c=read_key()) < 0);
#else
c= getchar();
#endif
return (toupper(c) == 'Y');
}
static int decode_interrupt_cb(void) static int decode_interrupt_cb(void)
{ {
return q_pressed > 1; return q_pressed > 1;
@ -2424,7 +2436,6 @@ static int transcode(OutputFile *output_files, int nb_output_files,
av_log(NULL, AV_LOG_INFO, "Press [q] to stop, [?] for help\n"); av_log(NULL, AV_LOG_INFO, "Press [q] to stop, [?] for help\n");
avio_set_interrupt_cb(decode_interrupt_cb); avio_set_interrupt_cb(decode_interrupt_cb);
} }
term_init();
timer_start = av_gettime(); timer_start = av_gettime();
@ -3699,10 +3710,11 @@ static void opt_output_file(void *optctx, const char *filename)
if (!using_stdin) { if (!using_stdin) {
fprintf(stderr,"File '%s' already exists. Overwrite ? [y/N] ", filename); fprintf(stderr,"File '%s' already exists. Overwrite ? [y/N] ", filename);
fflush(stderr); fflush(stderr);
if (!read_yesno()) { if (!read_yn()) {
av_log(0, AV_LOG_FATAL, "Not overwriting - exiting\n"); av_log(0, AV_LOG_FATAL, "\nNot overwriting - exiting\n");
exit_program(1); exit_program(1);
} }
fprintf(stderr,"\n");
} }
else { else {
av_log(0, AV_LOG_FATAL,"File '%s' already exists. Exiting.\n", filename); av_log(0, AV_LOG_FATAL,"File '%s' already exists. Exiting.\n", filename);
@ -4394,6 +4406,8 @@ int main(int argc, char **argv)
show_banner(); show_banner();
term_init();
/* parse options */ /* parse options */
parse_options(&o, argc, argv, options, opt_output_file); parse_options(&o, argc, argv, options, opt_output_file);