From 7b699d813681e4fad419ec63c96d595e98b2dbfa Mon Sep 17 00:00:00 2001 From: =?utf8?q?Martin=20Storsj=C3=B6?= Date: Fri, 7 Sep 2012 10:45:16 +0300 Subject: [PATCH] mov_chan: Only set the channel_layout if setting it to a nonzero value MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit 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). Signed-off-by: Martin Storsjö --- libavformat/mov_chan.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/libavformat/mov_chan.c b/libavformat/mov_chan.c index b1fa13f..00a2a4b 100644 --- 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, label_mask |= mask_incr; } } - if (layout_tag == 0) - st->codec->channel_layout = label_mask; - else + if (layout_tag == 0) { + if (label_mask) + st->codec->channel_layout = label_mask; + } else st->codec->channel_layout = ff_mov_get_channel_layout(layout_tag, bitmap); return 0; -- 2.7.4