Skip to content
Projects
Groups
Snippets
Help
Loading...
Sign in / Register
Toggle navigation
F
ffmpeg
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
Packages
Packages
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
submodule
ffmpeg
Commits
d2f8ca49
Commit
d2f8ca49
authored
Oct 19, 2014
by
Lukasz Marek
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
ffserver_config: clean up variable initialization
Signed-off-by:
Lukasz Marek
<
lukasz.m.luki2@gmail.com
>
parent
f524d2e4
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
5 additions
and
11 deletions
+5
-11
ffserver_config.c
ffserver_config.c
+5
-11
No files found.
ffserver_config.c
View file @
d2f8ca49
...
@@ -341,11 +341,11 @@ int ffserver_parse_ffconfig(const char *filename, FFServerConfig *config)
...
@@ -341,11 +341,11 @@ int ffserver_parse_ffconfig(const char *filename, FFServerConfig *config)
char
cmd
[
64
];
char
cmd
[
64
];
char
arg
[
1024
],
arg2
[
1024
];
char
arg
[
1024
],
arg2
[
1024
];
const
char
*
p
;
const
char
*
p
;
int
val
,
errors
,
warnings
,
line_num
;
int
val
,
errors
=
0
,
warnings
=
0
,
line_num
=
0
;
FFServerStream
**
last_stream
,
*
stream
,
*
redirect
;
FFServerStream
**
last_stream
,
*
stream
=
NULL
,
*
redirect
=
NULL
;
FFServerStream
**
last_feed
,
*
feed
,
*
s
;
FFServerStream
**
last_feed
,
*
feed
=
NULL
;
AVCodecContext
audio_enc
,
video_enc
;
AVCodecContext
audio_enc
,
video_enc
;
enum
AVCodecID
audio_id
,
video_id
;
enum
AVCodecID
audio_id
=
AV_CODEC_ID_NONE
,
video_id
=
AV_CODEC_ID_NONE
;
int
ret
=
0
;
int
ret
=
0
;
av_assert0
(
config
);
av_assert0
(
config
);
...
@@ -357,17 +357,10 @@ int ffserver_parse_ffconfig(const char *filename, FFServerConfig *config)
...
@@ -357,17 +357,10 @@ int ffserver_parse_ffconfig(const char *filename, FFServerConfig *config)
return
ret
;
return
ret
;
}
}
errors
=
warnings
=
0
;
line_num
=
0
;
config
->
first_stream
=
NULL
;
config
->
first_stream
=
NULL
;
last_stream
=
&
config
->
first_stream
;
last_stream
=
&
config
->
first_stream
;
config
->
first_feed
=
NULL
;
config
->
first_feed
=
NULL
;
last_feed
=
&
config
->
first_feed
;
last_feed
=
&
config
->
first_feed
;
stream
=
NULL
;
feed
=
NULL
;
redirect
=
NULL
;
audio_id
=
AV_CODEC_ID_NONE
;
video_id
=
AV_CODEC_ID_NONE
;
#define ERROR(...) report_config_error(filename, line_num, AV_LOG_ERROR, &errors, __VA_ARGS__)
#define ERROR(...) report_config_error(filename, line_num, AV_LOG_ERROR, &errors, __VA_ARGS__)
#define WARNING(...) report_config_error(filename, line_num, AV_LOG_WARNING, &warnings, __VA_ARGS__)
#define WARNING(...) report_config_error(filename, line_num, AV_LOG_WARNING, &warnings, __VA_ARGS__)
...
@@ -448,6 +441,7 @@ int ffserver_parse_ffconfig(const char *filename, FFServerConfig *config)
...
@@ -448,6 +441,7 @@ int ffserver_parse_ffconfig(const char *filename, FFServerConfig *config)
if
(
stream
||
feed
)
{
if
(
stream
||
feed
)
{
ERROR
(
"Already in a tag
\n
"
);
ERROR
(
"Already in a tag
\n
"
);
}
else
{
}
else
{
FFServerStream
*
s
;
feed
=
av_mallocz
(
sizeof
(
FFServerStream
));
feed
=
av_mallocz
(
sizeof
(
FFServerStream
));
if
(
!
feed
)
{
if
(
!
feed
)
{
ret
=
AVERROR
(
ENOMEM
);
ret
=
AVERROR
(
ENOMEM
);
...
...
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