summaryrefslogtreecommitdiff
path: root/libavformat/mov_chan.c
diff options
context:
space:
mode:
Diffstat (limited to 'libavformat/mov_chan.c')
-rw-r--r--libavformat/mov_chan.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/libavformat/mov_chan.c b/libavformat/mov_chan.c
index 074a32019a..58aec57374 100644
--- a/libavformat/mov_chan.c
+++ b/libavformat/mov_chan.c
@@ -580,9 +580,10 @@ int ff_mov_read_chan(AVFormatContext *s, AVIOContext *pb, AVStream *st,
label_mask |= mask_incr;
}
}
- if (layout_tag == 0)
+ if (layout_tag == 0) {
+ if (label_mask)
st->codec->channel_layout = label_mask;
- else
+ } else
st->codec->channel_layout = ff_mov_get_channel_layout(layout_tag, bitmap);
avio_skip(pb, size - 12);