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

2016-12-03 Thread Michael Niedermayer 
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 
> > ---
> >  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();
> > 
> 
> This is probably OK.

patchset applied up to and including this

thx


[...]
-- 
Michael GnuPG fingerprint: 9FF2128B147EF6730BADF133611EC787040B0FAB

Those who are best at talking, realize last or never when they are wrong.


signature.asc
Description: Digital signature
___
ffmpeg-devel mailing list
ffmpeg-devel@ffmpeg.org
http://ffmpeg.org/mailman/listinfo/ffmpeg-devel

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

2016-12-03 Thread Andreas Cadhalpun 
On 03.12.2016 00:52, Michael Niedermayer wrote:
> Signed-off-by: Michael Niedermayer 
> ---
>  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();
> 

This is probably OK.

Best regards,
Andreas
___
ffmpeg-devel mailing list
ffmpeg-devel@ffmpeg.org
http://ffmpeg.org/mailman/listinfo/ffmpeg-devel

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

2016-12-02 Thread Michael Niedermayer 
Signed-off-by: Michael Niedermayer 
---
 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();
-- 
2.11.0

___
ffmpeg-devel mailing list
ffmpeg-devel@ffmpeg.org
http://ffmpeg.org/mailman/listinfo/ffmpeg-devel