projects
/
platform
/
upstream
/
libav.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
9f63211
)
ffmpeg: fix streaming to ffserver.
author
Ronald S. Bultje
<rsbultje@gmail.com>
Tue, 14 Jun 2011 19:35:05 +0000
(15:35 -0400)
committer
Ronald S. Bultje
<rsbultje@gmail.com>
Tue, 14 Jun 2011 19:59:15 +0000
(15:59 -0400)
ffmpeg.c
patch
|
blob
|
history
diff --git
a/ffmpeg.c
b/ffmpeg.c
index
cbcdba8
..
04672cc
100644
(file)
--- a/
ffmpeg.c
+++ b/
ffmpeg.c
@@
-684,6
+684,7
@@
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 = NULL;
st->codec = avcodec_alloc_context();
if (!st->codec) {
print_error(filename, AVERROR(ENOMEM));