Merge commit 'edd9ea3ffba1d5873dead1c57c74b1e3cc912167'
authorMichael Niedermayer <michaelni@gmx.at>
Wed, 4 Feb 2015 12:18:45 +0000 (13:18 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Wed, 4 Feb 2015 12:18:51 +0000 (13:18 +0100)
* commit 'edd9ea3ffba1d5873dead1c57c74b1e3cc912167':
  aacdec: Refactor aac_er_decode_frame.

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

Simple merge