From f37f8d4c559e3238b5c1a47a3b97d9793f3f077f Mon Sep 17 00:00:00 2001
From: Alex Beregszaszi <alex@rtfs.hu>
Date: Wed, 12 Oct 2005 23:38:39 +0000
Subject: [PATCH] fix ffserver, it is working for me now again, a more elegant
fix is needed though
Originally committed as revision 4637 to svn://svn.ffmpeg.org/ffmpeg/trunk
---
ffmpeg.c | 7 +++++--
1 file changed, 5 insertions(+), 2 deletions(-)
diff --git a/ffmpeg.c b/ffmpeg.c
index c0126de605..269cecad4b 100644
--- a/ffmpeg.c
+++ b/ffmpeg.c
@@ -420,8 +420,11 @@ static int read_ffserver_streams(AVFormatContext *s, const char *filename)
for(i=0;i<ic->nb_streams;i++) {
AVStream *st;
+ // FIXME: a more elegant solution is needed
st = av_mallocz(sizeof(AVStream));
memcpy(st, ic->streams[i], sizeof(AVStream));
+ st->codec = avcodec_alloc_context();
+ memcpy(st->codec, ic->streams[i]->codec, sizeof(AVCodecContext));
s->streams[i] = st;
}
@@ -1742,8 +1745,8 @@ static int av_encode(AVFormatContext **output_files,
goto fail;
ost->img_resample_ctx = img_resample_full_init(
- ost->st->codec->width, ost->st->codec->height,
- ist->st->codec->width, ist->st->codec->height,
+ codec->width, codec->height,
+ icodec->width, icodec->height,
frame_topBand, frame_bottomBand,
frame_leftBand, frame_rightBand,
frame_padtop, frame_padbottom,