diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2012-09-08 12:53:44 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2012-09-08 12:53:44 +0200 |
| commit | 7beadfe1f7777574e99fd4cf6bcd7abad4fb4089 (patch) | |
| tree | 48b177a5d395f894b8ad8b99086cecf4271aedb5 /libavformat/mov_chan.c | |
| parent | 8a0118b4b49460fb2d33b3fac765c7131816ecc7 (diff) | |
| parent | 7b699d813681e4fad419ec63c96d595e98b2dbfa (diff) | |
Merge remote-tracking branch 'qatar/master'
* qatar/master:
mov_chan: Only set the channel_layout if setting it to a nonzero value
mov_chan: Reindent an incorrectly indented line
mp2 muxer: mark as AVFMT_NOTIMESTAMPS.
x86: float_dsp: fix ff_vector_fmac_scalar_avx() on Win64
x86: more specific checks for availability of required assembly capabilities
x86: avcodec: Drop silly "_mmx" suffix from dsputil template names
fate: Drop redundant setting of FUZZ to 1
cavsdsp: set idct permutation independently of dsputil
x86: allow using add_hfyu_median_prediction_cmov on any cpu with cmov
Conflicts:
libavcodec/x86/dsputil_mmx.c
libavformat/mp3enc.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavformat/mov_chan.c')
| -rw-r--r-- | libavformat/mov_chan.c | 5 |
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); |