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)
commit5348d7b605c0188852e6729c6dbc22afae590a73
treea90b73eb3c5602b667373b9806f2532b2cc5ac32
parentfd242b468d666a89a06af3bd2bd38144ce5df8dd
parentedd9ea3ffba1d5873dead1c57c74b1e3cc912167
Merge commit 'edd9ea3ffba1d5873dead1c57c74b1e3cc912167'

* commit 'edd9ea3ffba1d5873dead1c57c74b1e3cc912167':
  aacdec: Refactor aac_er_decode_frame.

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