diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-01-11 03:07:31 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-01-11 03:08:10 +0100 |
| commit | 9d5cc55f0fdf1f7b7dd729d7befb45923c0de181 (patch) | |
| tree | 7dbc1cc698905b2bc6b8fea102e98850a6a4141f /libavcodec/alac.c | |
| parent | b84a7330af41cec93384bf59ed68c67b09d105cd (diff) | |
| parent | 44a0a98f92c7df1452029aa0295e0ece9d2165ca (diff) | |
| download | ffmpeg-9d5cc55f0fdf1f7b7dd729d7befb45923c0de181.tar.gz | |
Merge remote-tracking branch 'qatar/master'
* qatar/master:
arm: Add an option for making sure NEON registers aren't clobbered
Conflicts:
configure
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/alac.c')
0 files changed, 0 insertions, 0 deletions