Merge commit '77ab341c0c6cdf2bd437bb48d429e797d1e60da2'
authorMichael Niedermayer <michaelni@gmx.at>
Tue, 4 Nov 2014 21:33:09 +0000 (22:33 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Tue, 4 Nov 2014 21:35:41 +0000 (22:35 +0100)
commitae4bb6c4884f16474856d7c6537e16999d4b16b1
treed9e8ab65933dce5b220f2c12486c63d1da4a8f7e
parentdf82125acba5699c74ebe7e1c9293e328e9a9f8a
parent77ab341c0c6cdf2bd437bb48d429e797d1e60da2
Merge commit '77ab341c0c6cdf2bd437bb48d429e797d1e60da2'

* commit '77ab341c0c6cdf2bd437bb48d429e797d1e60da2':
  aacdec: add default case in channel layout

Conflicts:
libavcodec/aacdec.c

Note, the default case is currently unreachable

See: a48b890392aa22033f182421ba9e3f3b3256461d
Merged-by: Michael Niedermayer <michaelni@gmx.at>
libavcodec/aacdec.c