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
7e183a93
Commit
7e183a93
authored
May 29, 2008
by
Baptiste Coudurier
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
reindent
Originally committed as revision 13523 to
svn://svn.ffmpeg.org/ffmpeg/trunk
parent
ce651af2
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
12 additions
and
12 deletions
+12
-12
ffserver.c
ffserver.c
+12
-12
No files found.
ffserver.c
View file @
7e183a93
...
...
@@ -4234,19 +4234,19 @@ static int parse_ffconfig(const char *filename)
filename
,
line_num
);
errors
++
;
}
else
{
if
(
stream
->
feed
&&
stream
->
fmt
&&
strcmp
(
stream
->
fmt
->
name
,
"ffm"
)
!=
0
)
{
if
(
audio_id
!=
CODEC_ID_NONE
)
{
audio_enc
.
codec_type
=
CODEC_TYPE_AUDIO
;
audio_enc
.
codec_id
=
audio_id
;
add_codec
(
stream
,
&
audio_enc
);
}
if
(
video_id
!=
CODEC_ID_NONE
)
{
video_enc
.
codec_type
=
CODEC_TYPE_VIDEO
;
video_enc
.
codec_id
=
video_id
;
add_codec
(
stream
,
&
video_enc
);
if
(
stream
->
feed
&&
stream
->
fmt
&&
strcmp
(
stream
->
fmt
->
name
,
"ffm"
)
!=
0
)
{
if
(
audio_id
!=
CODEC_ID_NONE
)
{
audio_enc
.
codec_type
=
CODEC_TYPE_AUDIO
;
audio_enc
.
codec_id
=
audio_id
;
add_codec
(
stream
,
&
audio_enc
);
}
if
(
video_id
!=
CODEC_ID_NONE
)
{
video_enc
.
codec_type
=
CODEC_TYPE_VIDEO
;
video_enc
.
codec_id
=
video_id
;
add_codec
(
stream
,
&
video_enc
);
}
}
}
stream
=
NULL
;
stream
=
NULL
;
}
}
else
if
(
!
strcasecmp
(
cmd
,
"<Redirect"
))
{
/*********************************************/
...
...
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