Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Contribute to GitLab
Sign in / Register
Toggle navigation
F
ffmpeg.wasm-core
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Linshizhi
ffmpeg.wasm-core
Commits
e084cad4
Commit
e084cad4
authored
Oct 08, 2011
by
Michael Niedermayer
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
ffmpeg: fix y/N regression so that \n is always needed
Signed-off-by:
Michael Niedermayer
<
michaelni@gmx.at
>
parent
cca81e7e
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
4 additions
and
17 deletions
+4
-17
ffmpeg.c
ffmpeg.c
+4
-17
No files found.
ffmpeg.c
View file @
e084cad4
...
...
@@ -609,20 +609,6 @@ static int read_key(void)
return
-
1
;
}
static
int
read_yn
(
void
)
{
int
c
,
t
;
#if HAVE_TERMIOS_H || HAVE_KBHIT
while
((
c
=
read_key
())
<
0
);
#else
t
=
c
=
getchar
();
while
(
t
!=
'\n'
&&
t
!=
EOF
)
t
=
getchar
();
#endif
return
(
toupper
(
c
)
==
'Y'
);
}
static
int
decode_interrupt_cb
(
void
)
{
return
received_nb_signals
>
1
;
...
...
@@ -3718,11 +3704,12 @@ static void opt_output_file(void *optctx, const char *filename)
if
(
!
using_stdin
)
{
fprintf
(
stderr
,
"File '%s' already exists. Overwrite ? [y/N] "
,
filename
);
fflush
(
stderr
);
if
(
!
read_yn
())
{
av_log
(
0
,
AV_LOG_FATAL
,
"
\n
Not overwriting - exiting
\n
"
);
term_exit
();
if
(
!
read_yesno
())
{
av_log
(
0
,
AV_LOG_FATAL
,
"Not overwriting - exiting
\n
"
);
exit_program
(
1
);
}
fprintf
(
stderr
,
"
\n
"
);
term_init
(
);
}
else
{
av_log
(
0
,
AV_LOG_FATAL
,
"File '%s' already exists. Exiting.
\n
"
,
filename
);
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment