Merge commit '7464e98f74c03d3efa0cdc8d7abad06e4c3c277a'
authorMichael Niedermayer <michaelni@gmx.at>
Tue, 2 Dec 2014 20:29:48 +0000 (21:29 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Tue, 2 Dec 2014 20:29:48 +0000 (21:29 +0100)
commit61d0a6dd9554ecd705518d38d531363cdabab7d3
tree9119cf539e023a3510d8dbcb72c17d8122b46278
parent9adc999d2a927123d4b37a2a0c6eeb0d37c12cef
parent7464e98f74c03d3efa0cdc8d7abad06e4c3c277a
Merge commit '7464e98f74c03d3efa0cdc8d7abad06e4c3c277a'

* commit '7464e98f74c03d3efa0cdc8d7abad06e4c3c277a':
  aac: Simplify decode_mid_side_stereo

Conflicts:
libavcodec/aacdec.c

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