[FFmpeg-cvslog] Merge commit 'edd9ea3ffba1d5873dead1c57c74b1e3cc912167'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Wed Feb  4 13:18:45 2015 +0100| [5348d7b605c0188852e6729c6dbc22afae590a73] | committer: Michael Niedermayer

Merge commit 'edd9ea3ffba1d5873dead1c57c74b1e3cc912167'

* commit 'edd9ea3ffba1d5873dead1c57c74b1e3cc912167':
  aacdec: Refactor aac_er_decode_frame.

Merged-by: Michael Niedermayer <michaelni at gmx.at>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=5348d7b605c0188852e6729c6dbc22afae590a73
---