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
ace21da3
Commit
ace21da3
authored
Jun 23, 2008
by
Baptiste Coudurier
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
cosmetics, braces placement
Originally committed as revision 13908 to
svn://svn.ffmpeg.org/ffmpeg/trunk
parent
51f90867
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
5 additions
and
10 deletions
+5
-10
ffserver.c
ffserver.c
+5
-10
No files found.
ffserver.c
View file @
ace21da3
...
...
@@ -1692,8 +1692,7 @@ static void compute_status(HTTPContext *c)
stream
->
conns_served
);
fmt_bytecount
(
pb
,
stream
->
bytes_served
);
switch
(
stream
->
stream_type
)
{
case
STREAM_TYPE_LIVE
:
{
case
STREAM_TYPE_LIVE
:
{
int
audio_bit_rate
=
0
;
int
video_bit_rate
=
0
;
const
char
*
audio_codec_name
=
""
;
...
...
@@ -1931,13 +1930,11 @@ static int open_input_stream(HTTPContext *c, const char *info)
strcpy
(
input_filename
,
c
->
stream
->
feed
->
feed_filename
);
buf_size
=
FFM_PACKET_SIZE
;
/* compute position (absolute time) */
if
(
find_info_tag
(
buf
,
sizeof
(
buf
),
"date"
,
info
))
{
if
(
find_info_tag
(
buf
,
sizeof
(
buf
),
"date"
,
info
))
{
stream_pos
=
parse_date
(
buf
,
0
);
if
(
stream_pos
==
INT64_MIN
)
return
-
1
;
}
else
if
(
find_info_tag
(
buf
,
sizeof
(
buf
),
"buffer"
,
info
))
{
}
else
if
(
find_info_tag
(
buf
,
sizeof
(
buf
),
"buffer"
,
info
))
{
int
prebuffer
=
strtol
(
buf
,
0
,
10
);
stream_pos
=
av_gettime
()
-
prebuffer
*
(
int64_t
)
1000000
;
}
else
...
...
@@ -1946,13 +1943,11 @@ static int open_input_stream(HTTPContext *c, const char *info)
strcpy
(
input_filename
,
c
->
stream
->
feed_filename
);
buf_size
=
0
;
/* compute position (relative time) */
if
(
find_info_tag
(
buf
,
sizeof
(
buf
),
"date"
,
info
))
{
if
(
find_info_tag
(
buf
,
sizeof
(
buf
),
"date"
,
info
))
{
stream_pos
=
parse_date
(
buf
,
1
);
if
(
stream_pos
==
INT64_MIN
)
return
-
1
;
}
else
}
else
stream_pos
=
0
;
}
if
(
input_filename
[
0
]
==
'\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