[libav-devel] [PATCH 2/2] mov_chan: Only set the channel_layout if setting it to a nonzero value

2012-09-07 Thread Martin Storsjö
If regularly parsing new chan atoms (as in rtpdec_qt), but the chan atoms don't actually contain any channel layout, don't reset the value that the caller has filled in (by guessing). --- This is an alternative solution to the patches for avconv/avplay. --- libavformat/mov_chan.c |7 --- 1

Re: [libav-devel] [PATCH 2/2] mov_chan: Only set the channel_layout if setting it to a nonzero value

2012-09-07 Thread Diego Biurrun
On Fri, Sep 07, 2012 at 10:59:26AM +0300, Martin Storsjö wrote: > > --- a/libavformat/mov_chan.c > +++ b/libavformat/mov_chan.c > @@ -579,9 +579,10 @@ int ff_mov_read_chan(AVFormatContext *s, AVIOContext > *pb, AVStream *st, > -if (layout_tag == 0) > -st->codec->channel_layout = label

Re: [libav-devel] [PATCH 2/2] mov_chan: Only set the channel_layout if setting it to a nonzero value

2012-09-07 Thread Martin Storsjö
On Fri, 7 Sep 2012, Diego Biurrun wrote: On Fri, Sep 07, 2012 at 10:59:26AM +0300, Martin Storsjö wrote: --- a/libavformat/mov_chan.c +++ b/libavformat/mov_chan.c @@ -579,9 +579,10 @@ int ff_mov_read_chan(AVFormatContext *s, AVIOContext *pb, AVStream *st, -if (layout_tag == 0) -st

Re: [libav-devel] [PATCH 2/2] mov_chan: Only set the channel_layout if setting it to a nonzero value

2012-09-07 Thread Diego Biurrun
On Fri, Sep 07, 2012 at 11:24:20AM +0300, Martin Storsjö wrote: > On Fri, 7 Sep 2012, Diego Biurrun wrote: > >On Fri, Sep 07, 2012 at 10:59:26AM +0300, Martin Storsjö wrote: > >> > >>--- a/libavformat/mov_chan.c > >>+++ b/libavformat/mov_chan.c > >>@@ -579,9 +579,10 @@ int ff_mov_read_chan(AVFormat

Re: [libav-devel] [PATCH 2/2] mov_chan: Only set the channel_layout if setting it to a nonzero value

2012-09-07 Thread Justin Ruggles
On 09/07/2012 03:59 AM, Martin Storsjö wrote: > If regularly parsing new chan atoms (as in rtpdec_qt), but the > chan atoms don't actually contain any channel layout, don't reset > the value that the caller has filled in (by guessing). > --- > This is an alternative solution to the patches for avco