diff mbox

[FFmpeg-devel,4/5] ffserver: remove one avcodec_context_copy()

Message ID 20161202235258.26223-4-michael@niedermayer.cc
State Accepted
Commit 6c15618b90e4872e119fb083d31b6fc7661b33bb
Headers show

Commit Message

Michael Niedermayer Dec. 2, 2016, 11:52 p.m. UTC 
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
---
 ffserver.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

Comments

Andreas Cadhalpun Dec. 3, 2016, 11:49 a.m. UTC | #1 
On 03.12.2016 00:52, Michael Niedermayer wrote:
> Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
> ---
>  ffserver.c | 3 ++-
>  1 file changed, 2 insertions(+), 1 deletion(-)
> 
> 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);
> 

This is probably OK.

Best regards,
Andreas
Michael Niedermayer Dec. 3, 2016, 12:55 p.m. UTC | #2 
On Sat, Dec 03, 2016 at 12:49:28PM +0100, Andreas Cadhalpun wrote:
> On 03.12.2016 00:52, Michael Niedermayer wrote:
> > Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
> > ---
> >  ffserver.c | 3 ++-
> >  1 file changed, 2 insertions(+), 1 deletion(-)
> > 
> > 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);
> > 
> 
> This is probably OK.

patchset applied up to and including this

thx


[...]
diff mbox

Patch

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);