diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2012-12-18 14:27:59 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2012-12-18 14:27:59 +0100 |
| commit | 94ecbe23c52b699a8f2bda1cf71fb4efbf28679a (patch) | |
| tree | 240b05c733a4d256ffbffa74f80fa3dcea49fc81 /COPYING.LGPLv2.1 | |
| parent | 95015634f5017897a61f4883bc217b0f7efbc40c (diff) | |
| parent | c35f0e8495e34c2082dcde805e9323c9f6a4cb0a (diff) | |
| download | ffmpeg-94ecbe23c52b699a8f2bda1cf71fb4efbf28679a.tar.gz | |
Merge commit 'c35f0e8495e34c2082dcde805e9323c9f6a4cb0a'
* commit 'c35f0e8495e34c2082dcde805e9323c9f6a4cb0a':
au: Reorder code so that both muxer and demuxer are under #ifdefs
fate: Move RALF test into lossless audio group
cosmetics: Use consistent names for multiple inclusion guards.
Conflicts:
libavformat/au.c
tests/fate/lossless-audio.mak
tests/fate/real.mak
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'COPYING.LGPLv2.1')
0 files changed, 0 insertions, 0 deletions