diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-08-29 14:32:05 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-08-29 14:32:05 +0200 |
| commit | 477641e9f8a711b65a463ea75a4167b7cfdc84a5 (patch) | |
| tree | 3e9ad5bed88a8aa05f580d5db98dbb226899b184 /libswscale/x86 | |
| parent | 29daad5b98bc07b9669c22b39113f5568ef1c570 (diff) | |
| parent | a64f6a04ac5773aeff2003897455dadb9609f18b (diff) | |
Merge commit 'a64f6a04ac5773aeff2003897455dadb9609f18b'
* commit 'a64f6a04ac5773aeff2003897455dadb9609f18b':
dsputil: x86: Hide arch-specific initialization details
Conflicts:
libavcodec/x86/Makefile
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libswscale/x86')
0 files changed, 0 insertions, 0 deletions