diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-05-06 20:46:27 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-05-06 20:46:27 +0200 |
| commit | 32cc7dacde6d4970719cb59ec58ec48f64291ee9 (patch) | |
| tree | 9cb367a640ed5fbacee792b42b84d6212f8e7e37 /doc | |
| parent | 8cdf95d9b8f936ee823258ac7bd78958ed69d156 (diff) | |
| parent | 9e5e76ef9ea803432ef2782a3f528c3f5bab621e (diff) | |
| download | ffmpeg-32cc7dacde6d4970719cb59ec58ec48f64291ee9.tar.gz | |
Merge commit '9e5e76ef9ea803432ef2782a3f528c3f5bab621e'
* commit '9e5e76ef9ea803432ef2782a3f528c3f5bab621e':
x86: More specific ifdefs for dsputil/hpeldsp init functions
Conflicts:
libavcodec/x86/dsputil_mmx.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'doc')
0 files changed, 0 insertions, 0 deletions