generic-library/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

ffserver: Use avcodec_copy_context instead of manually copying an AVCodecContext

Browse Source 
Originally committed as revision 23692 to svn://svn.ffmpeg.org/ffmpeg/trunk
This commit is contained in:
Martin Storsjö 2010-06-22 06:45:05 +00:00
parent 33e7febdbe
commit 5634f30c4a
1 changed files with 1 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
ffserver.c
View File

@ -2748,14 +2748,7 @@ static int http_receive_data(HTTPContext *c)
for (i = 0; i < s->nb_streams; i++) {
AVStream *fst = feed->streams[i];
AVStream *st = s->streams[i];
memcpy(fst->codec, st->codec, sizeof(AVCodecContext));
if (fst->codec->extradata_size) {
fst->codec->extradata = av_malloc(fst->codec->extradata_size);
if (!fst->codec->extradata)
goto fail;
memcpy(fst->codec->extradata, st->codec->extradata,
fst->codec->extradata_size);
}
avcodec_copy_context(fst->codec, st->codec);
}
av_close_input_stream(s);