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)
* commit '7464e98f74c03d3efa0cdc8d7abad06e4c3c277a':
  aac: Simplify decode_mid_side_stereo

Conflicts:
libavcodec/aacdec.c

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

Simple merge