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
840238b8
Commit
840238b8
authored
May 21, 2011
by
Mike William
Committed by
Michael Niedermayer
May 21, 2011
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
ffserver: dont just crash
With changes from ubitux.
parent
ab1c19ef
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
6 additions
and
5 deletions
+6
-5
ffmpeg.c
ffmpeg.c
+2
-0
ffserver.c
ffserver.c
+4
-5
No files found.
ffmpeg.c
View file @
840238b8
...
...
@@ -713,6 +713,8 @@ static int read_ffserver_streams(AVFormatContext *s, const char *filename)
// FIXME: a more elegant solution is needed
st
=
av_mallocz
(
sizeof
(
AVStream
));
memcpy
(
st
,
ic
->
streams
[
i
],
sizeof
(
AVStream
));
st
->
info
=
av_malloc
(
sizeof
(
*
st
->
info
));
memcpy
(
st
->
info
,
ic
->
streams
[
i
]
->
info
,
sizeof
(
*
st
->
info
));
st
->
codec
=
avcodec_alloc_context
();
if
(
!
st
->
codec
)
{
print_error
(
filename
,
AVERROR
(
ENOMEM
));
...
...
ffserver.c
View file @
840238b8
...
...
@@ -3386,6 +3386,9 @@ static int rtp_new_av_stream(HTTPContext *c,
if
(
!
st
)
goto
fail
;
ctx
->
nb_streams
=
1
;
ctx
->
streams
=
av_mallocz
(
sizeof
(
*
ctx
->
streams
)
*
ctx
->
nb_streams
);
if
(
!
ctx
->
streams
)
goto
fail
;
ctx
->
streams
[
0
]
=
st
;
if
(
!
c
->
stream
->
feed
||
...
...
@@ -3766,11 +3769,7 @@ static void build_feed_streams(void)
}
s
->
oformat
=
feed
->
fmt
;
s
->
nb_streams
=
feed
->
nb_streams
;
for
(
i
=
0
;
i
<
s
->
nb_streams
;
i
++
)
{
AVStream
*
st
;
st
=
feed
->
streams
[
i
];
s
->
streams
[
i
]
=
st
;
}
s
->
streams
=
feed
->
streams
;
av_set_parameters
(
s
,
NULL
);
if
(
av_write_header
(
s
)
<
0
)
{
http_log
(
"Container doesn't supports the required parameters
\n
"
);
...
...
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