diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2012-11-26 15:15:02 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2012-11-26 15:15:02 +0100 |
| commit | 59b68ee8870ad7b831321ff39638660ac59e4a18 (patch) | |
| tree | e7d148ab5589e5869ed46914773ba5f140915ba1 /tools | |
| parent | a13148f63351db5f8283a23de9a22e940d29d8cd (diff) | |
| parent | 3d3cf6745e2a5dc9c377244454c3186d75b177fa (diff) | |
| download | ffmpeg-59b68ee8870ad7b831321ff39638660ac59e4a18.tar.gz | |
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>
Diffstat (limited to 'tools')
0 files changed, 0 insertions, 0 deletions