[SCM] libav/experimental: ffserver: Use avcodec_copy_context instead of manually copying an AVCodecContext

[siretart at users.alioth.debian.org]

The following commit has been merged in the experimental branch:
commit 5634f30c4a25c17c1de26703948efeafb733413d
Author: Martin Storsjö <martin at martin.st>
Date:   Tue Jun 22 06:45:05 2010 +0000

    ffserver: Use avcodec_copy_context instead of manually copying an AVCodecContext
    
    Originally committed as revision 23692 to svn://svn.ffmpeg.org/ffmpeg/trunk

diff --git a/ffserver.c b/ffserver.c
index 31d0268..14141f7 100644
--- a/ffserver.c
+++ b/ffserver.c
@@ -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);

-- 
Libav/FFmpeg packaging