Merge commit '3d3cf6745e2a5dc9c377244454c3186d75b177fa'
authorMichael Niedermayer <michaelni@gmx.at>
Mon, 26 Nov 2012 14:15:02 +0000 (15:15 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Mon, 26 Nov 2012 14:15:02 +0000 (15:15 +0100)
commit59b68ee8870ad7b831321ff39638660ac59e4a18
treee7d148ab5589e5869ed46914773ba5f140915ba1
parenta13148f63351db5f8283a23de9a22e940d29d8cd
parent3d3cf6745e2a5dc9c377244454c3186d75b177fa
Merge commit '3d3cf6745e2a5dc9c377244454c3186d75b177fa'

* commit '3d3cf6745e2a5dc9c377244454c3186d75b177fa':
  aacdec: use float planar sample format for output

Conflicts:
libavcodec/aacdec.c
libavcodec/aacsbr.c

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