Michael Niedermayer
7766c7b7a0
Merge commit '7151c5d04aed3b496c21f713dcb603e2cbdb9c49'
...
* commit '7151c5d04aed3b496c21f713dcb603e2cbdb9c49':
arm: Use full filenames as multiple inclusion guards
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-01-14 14:38:10 +01:00
Diego Biurrun
7151c5d04a
arm: Use full filenames as multiple inclusion guards
2014-01-14 00:04:52 +01:00
Michael Niedermayer
c4010972c4
Merge commit '7384b7a71338d960e421d6dc3d77da09b0a442cb'
...
* commit '7384b7a71338d960e421d6dc3d77da09b0a442cb':
arm: hpeldsp: Move half-pel assembly from dsputil to hpeldsp
Conflicts:
libavcodec/arm/Makefile
libavcodec/arm/hpeldsp_arm.S
libavcodec/arm/hpeldsp_arm.h
libavcodec/arm/hpeldsp_armv6.S
libavcodec/arm/hpeldsp_init_arm.c
libavcodec/arm/hpeldsp_init_armv6.c
libavcodec/arm/hpeldsp_init_neon.c
libavcodec/arm/hpeldsp_neon.S
libavcodec/hpeldsp.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-04-20 14:19:08 +02:00
Ronald S. Bultje
7384b7a713
arm: hpeldsp: Move half-pel assembly from dsputil to hpeldsp
...
Signed-off-by: Martin Storsjö <martin@martin.st>
2013-04-19 23:19:08 +03:00
Ronald S. Bultje
de99545f46
Move arm half-pel assembly from dsputil to hpeldsp.
2013-03-13 04:04:13 +01:00
