diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-01-10 11:12:08 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-01-10 11:12:08 +0100 |
| commit | be894d6caeafdd6826cbc0f46030eab7c82c7cfc (patch) | |
| tree | 10e25a3380d100a50c5335c8b07d4b07098899c5 /libavcodec/x86/imdct36.asm | |
| parent | 0287eea914307a3fa03fa0d117af2955de0a4a2f (diff) | |
| parent | c837b38dd33a11c3810e988a60193a858eb4f58c (diff) | |
| download | ffmpeg-be894d6caeafdd6826cbc0f46030eab7c82c7cfc.tar.gz | |
Merge commit 'c837b38dd33a11c3810e988a60193a858eb4f58c'
* commit 'c837b38dd33a11c3810e988a60193a858eb4f58c':
au: move skipping of unused data to before parameter validation
au: do not arbitrarily limit channel count
Conflicts:
libavformat/au.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/x86/imdct36.asm')
0 files changed, 0 insertions, 0 deletions