diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-07-05 19:19:22 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-07-05 19:50:05 +0200 |
| commit | 5036c8b17b29623cd86b514474d1c0a81acf1e13 (patch) | |
| tree | 9c1c36326fbf1a9058b1da6bc999f50588064a0b /libavcodec/sipr.c | |
| parent | d5601cf6fc1c1606ec45466d5d72fd1e60a4ba3b (diff) | |
| parent | 12f129e545e5a5844b6ad7f3eb6a438015cad8bc (diff) | |
Merge commit '12f129e545e5a5844b6ad7f3eb6a438015cad8bc'
* commit '12f129e545e5a5844b6ad7f3eb6a438015cad8bc':
x86: Unconditionally compile blockdsp and svq1enc init files
Conflicts:
libavcodec/x86/Makefile
blockdsp_mmx is renamed to blockdsp_init as we already have a blockdsp file
and _init is how all other such files are called
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/sipr.c')
0 files changed, 0 insertions, 0 deletions