summaryrefslogtreecommitdiffstats
path: root/libavcodec/x86/inline_asm.h
Commit message (Collapse)AuthorAgeFilesLines
* Merge commit '1a8d0cf77ed2611e542ae98f341d4c43a04467bd'Michael Niedermayer2014-03-221-4/+4
| | | | | | | | | | * commit '1a8d0cf77ed2611e542ae98f341d4c43a04467bd': x86: dsputil: Move inline assembly macros to a separate header Conflicts: libavcodec/x86/dsputil_mmx.c Merged-by: Michael Niedermayer <[email protected]>
* x86: dsputil: Move inline assembly macros to a separate headerDiego Biurrun2014-03-221-0/+100