diff options
| author | Michael Niedermayer <michael@niedermayer.cc> | 2016-12-03 00:52:57 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michael@niedermayer.cc> | 2016-12-03 14:05:15 +0100 |
| commit | 6c15618b90e4872e119fb083d31b6fc7661b33bb (patch) | |
| tree | 29b9448b576a12ca3d36342ef61c7f073cd0a0dc | |
| parent | 418a2b247818121b33efd754b626731c87881ed6 (diff) | |
| download | ffmpeg-6c15618b90e4872e119fb083d31b6fc7661b33bb.tar.gz | |
ffserver: remove one avcodec_context_copy()
Reviewed-by: Andreas Cadhalpun <andreas.cadhalpun@googlemail.com>
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
| -rw-r--r-- | ffserver.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/ffserver.c b/ffserver.c index 19c3ceda1a..3ff761f68f 100644 --- a/ffserver.c +++ b/ffserver.c @@ -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); |