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
1f7d5860
Unverified
Commit
1f7d5860
authored
Sep 08, 2016
by
Rodger Combs
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
ffmpeg: don't reconfigure terminal if we're not taking input from stdin
parent
711bfb33
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
4 additions
and
3 deletions
+4
-3
ffmpeg.c
ffmpeg.c
+1
-3
ffmpeg_opt.c
ffmpeg_opt.c
+3
-0
No files found.
ffmpeg.c
View file @
1f7d5860
...
@@ -366,7 +366,7 @@ static BOOL WINAPI CtrlHandler(DWORD fdwCtrlType)
...
@@ -366,7 +366,7 @@ static BOOL WINAPI CtrlHandler(DWORD fdwCtrlType)
void
term_init
(
void
)
void
term_init
(
void
)
{
{
#if HAVE_TERMIOS_H
#if HAVE_TERMIOS_H
if
(
!
run_as_daemon
)
{
if
(
!
run_as_daemon
&&
stdin_interaction
)
{
struct
termios
tty
;
struct
termios
tty
;
if
(
tcgetattr
(
0
,
&
tty
)
==
0
)
{
if
(
tcgetattr
(
0
,
&
tty
)
==
0
)
{
oldtty
=
tty
;
oldtty
=
tty
;
...
@@ -4493,8 +4493,6 @@ int main(int argc, char **argv)
...
@@ -4493,8 +4493,6 @@ int main(int argc, char **argv)
show_banner
(
argc
,
argv
,
options
);
show_banner
(
argc
,
argv
,
options
);
term_init
();
/* parse options and open all input/output files */
/* parse options and open all input/output files */
ret
=
ffmpeg_parse_options
(
argc
,
argv
);
ret
=
ffmpeg_parse_options
(
argc
,
argv
);
if
(
ret
<
0
)
if
(
ret
<
0
)
...
...
ffmpeg_opt.c
View file @
1f7d5860
...
@@ -3160,6 +3160,9 @@ int ffmpeg_parse_options(int argc, char **argv)
...
@@ -3160,6 +3160,9 @@ int ffmpeg_parse_options(int argc, char **argv)
goto
fail
;
goto
fail
;
}
}
/* configure terminal and setup signal handlers */
term_init
();
/* open input files */
/* open input files */
ret
=
open_files
(
&
octx
.
groups
[
GROUP_INFILE
],
"input"
,
open_input_file
);
ret
=
open_files
(
&
octx
.
groups
[
GROUP_INFILE
],
"input"
,
open_input_file
);
if
(
ret
<
0
)
{
if
(
ret
<
0
)
{
...
...
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