Commit 2238e298 authored by alex's avatar alex

fix ffserver, it is working for me now again, a more elegant fix is needed though


git-svn-id: file:///var/local/repositories/ffmpeg/trunk@4637 9553f0bf-9b14-0410-a0b8-cfaf0461ba5b
parent 0c8c386d
......@@ -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,
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment