Added fixes and tweaks suggested by Maksym Veremeyenko [[email protected]]
Signed-off-by: Mike Williams <[email protected]>
---
ffmpeg.c | 5 ++---
ffserver.c | 18 +++++++-----------
2 files changed, 9 insertions(+), 14 deletions(-)
diff --git a/ffmpeg.c b/ffmpeg.c
index c99c4de..8905fe8 100644
--- a/ffmpeg.c
+++ b/ffmpeg.c
@@ -626,13 +626,12 @@ static int read_ffserver_streams(AVFormatContext *s,
const char *filename)
if (err < 0)
return err;
/* copy stream format */
- s->nb_streams = 0;
+ s->nb_streams = ic->nb_streams;
+ s->streams = av_mallocz(sizeof(AVStream *) * s->nb_streams);
for(i=0;i<ic->nb_streams;i++) {
AVStream *st;
AVCodec *codec;
- s->nb_streams++;
-
// FIXME: a more elegant solution is needed
st = av_mallocz(sizeof(AVStream));
memcpy(st, ic->streams[i], sizeof(AVStream));
diff --git a/ffserver.c b/ffserver.c
index b4613af..fd22f11 100644
--- a/ffserver.c
+++ b/ffserver.c
@@ -2229,11 +2229,11 @@ static int http_prepare_data(HTTPContext *c)
av_metadata_set2(&c->fmt_ctx.metadata, "copyright",
c->stream->copyright, 0);
av_metadata_set2(&c->fmt_ctx.metadata, "title" , c->stream->title
, 0);
+ c->fmt_ctx.streams = av_mallocz(sizeof(AVStream *) *
c->stream->nb_streams);
+
for(i=0;i<c->stream->nb_streams;i++) {
- AVStream *st;
+ c->fmt_ctx.streams[i] = av_mallocz(sizeof(AVStream));
AVStream *src;
- st = av_mallocz(sizeof(AVStream));
- c->fmt_ctx.streams[i] = st;
/* if file or feed, then just take streams from FFStream struct */
if (!c->stream->feed ||
c->stream->feed == c->stream)
@@ -2241,9 +2241,9 @@ static int http_prepare_data(HTTPContext *c)
else
src = c->stream->feed->streams[c->stream->feed_streams[i]];
- *st = *src;
- st->priv_data = 0;
- st->codec->frame_number = 0; /* XXX: should be done in
+ *(c->fmt_ctx.streams[i]) = *src;
+ c->fmt_ctx.streams[i]->priv_data = 0;
+ c->fmt_ctx.streams[i]->codec->frame_number = 0; /* XXX: should be
done in
AVStream, not in codec */
}
/* set output format parameters */
@@ -3765,11 +3765,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");
--
1.7.3.4
_______________________________________________
libav-devel mailing list
[email protected]
https://lists.libav.org/mailman/listinfo/libav-devel
