diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-05-30 00:59:15 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-05-30 00:59:15 +0200 |
| commit | 40f3a87c10d5773eb66e09f4ed3d8197b1840863 (patch) | |
| tree | bee50efb5beaff032de1fc4dcd797e3000b30c4c /libavcodec/x86/dca.h | |
| parent | 5c6e94c42bcdc026071855a6b1749406b2456c8b (diff) | |
| parent | 054013a0fc6f2b52c60cee3e051be8cc7f82cef3 (diff) | |
| download | ffmpeg-40f3a87c10d5773eb66e09f4ed3d8197b1840863.tar.gz | |
Merge commit '054013a0fc6f2b52c60cee3e051be8cc7f82cef3'
* commit '054013a0fc6f2b52c60cee3e051be8cc7f82cef3':
dsputil: Move APE-specific bits into apedsp
Conflicts:
libavcodec/arm/int_neon.S
libavcodec/x86/dsputil.asm
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/x86/dca.h')
0 files changed, 0 insertions, 0 deletions