OSDN Git Service

ffserver: remove one avcodec_context_copy()
authorMichael Niedermayer <michael@niedermayer.cc>
Fri, 2 Dec 2016 23:52:57 +0000 (00:52 +0100)
committerMichael Niedermayer <michael@niedermayer.cc>
Sat, 3 Dec 2016 13:05:15 +0000 (14:05 +0100)
Reviewed-by: Andreas Cadhalpun <andreas.cadhalpun@googlemail.com>
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
ffserver.c

index 19c3ced..3ff761f 100644 (file)
@@ -2854,7 +2854,8 @@ static int http_receive_data(HTTPContext *c)
             for (i = 0; i < s->nb_streams; i++) {
                 LayeredAVStream *fst = feed->streams[i];
                 AVStream *st = s->streams[i];
-                avcodec_copy_context(fst->codec, st->codec);
+                avcodec_parameters_to_context(fst->codec, st->codecpar);
+                avcodec_parameters_from_context(fst->codecpar, fst->codec);
             }
 
             avformat_close_input(&s);