git.sesse.net Git - ffmpeg/commit

]> git.sesse.net Git - ffmpeg/commit

author	Michael Niedermayer <michaelni@gmx.at>
	Mon, 26 Nov 2012 14:15:02 +0000 (15:15 +0100)
committer	Michael Niedermayer <michaelni@gmx.at>
	Mon, 26 Nov 2012 14:15:02 +0000 (15:15 +0100)
commit	59b68ee8870ad7b831321ff39638660ac59e4a18
tree	e7d148ab5589e5869ed46914773ba5f140915ba1	tree \| snapshot
parent	a13148f63351db5f8283a23de9a22e940d29d8cd	commit \| diff
parent	3d3cf6745e2a5dc9c377244454c3186d75b177fa	commit \| diff

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>

Unnamed repository; edit this file 'description' to name the repository.