diff options
author | Michael Niedermayer <michaelni@gmx.at> | 2013-06-28 10:00:51 +0200 |
---|---|---|
committer | Michael Niedermayer <michaelni@gmx.at> | 2013-06-28 10:00:51 +0200 |
commit | 1bcfb1eea836e3c357732ece6d96f5c87938b6d6 (patch) | |
tree | 5078deb27b3de5a85c1646437b9fcf545c5005a8 /tests/ref/fate/wavpack-channels-6.1 | |
parent | ef906390043010cde8844ec30da79926f2f8b846 (diff) | |
parent | 6d8629aac13692447b54eac795bf74007ebf8987 (diff) | |
download | ffmpeg-1bcfb1eea836e3c357732ece6d96f5c87938b6d6.tar.gz |
Merge commit '6d8629aac13692447b54eac795bf74007ebf8987'
* commit '6d8629aac13692447b54eac795bf74007ebf8987':
aac: K&R formatting cosmetics
Conflicts:
libavcodec/aacdec.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'tests/ref/fate/wavpack-channels-6.1')
0 files changed, 0 insertions, 0 deletions