diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-05-03 10:49:46 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-05-03 10:50:27 +0200 |
| commit | 05599308e98895e3c9aa6c1c90a2086aa029c42e (patch) | |
| tree | 82b97af2f49d4d863d231a58d84c9049fd9363ce /libavformat/wavdec.c | |
| parent | 35ef98013dfc8b9c4c4c3d6e87ff235b02cf71bc (diff) | |
| parent | bf7c3c6b157f7938578f964b62cffd5e504940be (diff) | |
| download | ffmpeg-05599308e98895e3c9aa6c1c90a2086aa029c42e.tar.gz | |
Merge commit 'bf7c3c6b157f7938578f964b62cffd5e504940be'
* commit 'bf7c3c6b157f7938578f964b62cffd5e504940be':
x86: dsputil: Move cavs and vc1-specific functions where they belong
Conflicts:
libavcodec/x86/dsputil_mmx.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavformat/wavdec.c')
0 files changed, 0 insertions, 0 deletions