aboutsummaryrefslogtreecommitdiffstats
path: root/libavcodec/x86/h264_chromamc_10bit.asm
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2014-03-22 23:21:54 +0100
committerMichael Niedermayer <michaelni@gmx.at>2014-03-22 23:21:54 +0100
commit74fed968d1b6f0aec9c08b9ac4fcad4314e0460a (patch)
treee71ce5a64ad6d1c6287915220e11698aeed8d2f1 /libavcodec/x86/h264_chromamc_10bit.asm
parent816d7936a714b050a86cd376c9dd0c175a6fd9fa (diff)
parent82dd1026cfc1d72b04019185bea4c1c9621ace3f (diff)
downloadffmpeg-74fed968d1b6f0aec9c08b9ac4fcad4314e0460a.tar.gz
Merge commit '82dd1026cfc1d72b04019185bea4c1c9621ace3f'
* commit '82dd1026cfc1d72b04019185bea4c1c9621ace3f': x86: dsputil: Move hpeldsp-related declarations to a separate header Conflicts: libavcodec/x86/dsputil_x86.h Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/x86/h264_chromamc_10bit.asm')
0 files changed, 0 insertions, 0 deletions