videolan/ffmpeg
1
Fork 0
mirror of https://git.videolan.org/git/ffmpeg.git synced 2024-09-12 10:25:32 +02:00
Code Releases Activity

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

Browse Source 
Originally committed as revision 4637 to svn://svn.ffmpeg.org/ffmpeg/trunk
This commit is contained in:
Alex Beregszaszi 2005-10-12 23:38:39 +00:00
parent 26aa0f8956
commit f37f8d4c55
1 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
ffmpeg.c
View File

@ -420,8 +420,11 @@ static int read_ffserver_streams(AVFormatContext *s, const char *filename)
for(i=0;i<ic->nb_streams;i++) { for(i=0;i<ic->nb_streams;i++) {
AVStream *st; AVStream *st;
// FIXME: a more elegant solution is needed
st = av_mallocz(sizeof(AVStream)); st = av_mallocz(sizeof(AVStream));
memcpy(st, ic->streams[i], 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; s->streams[i] = st;
} }
@ -1742,8 +1745,8 @@ static int av_encode(AVFormatContext **output_files,
goto fail; goto fail;
ost->img_resample_ctx = img_resample_full_init( ost->img_resample_ctx = img_resample_full_init(
ost->st->codec->width, ost->st->codec->height, codec->width, codec->height,
ist->st->codec->width, ist->st->codec->height, icodec->width, icodec->height,
frame_topBand, frame_bottomBand, frame_topBand, frame_bottomBand,
frame_leftBand, frame_rightBand, frame_leftBand, frame_rightBand,
frame_padtop, frame_padbottom, frame_padtop, frame_padbottom,