Michael Niedermayer
1c788eaca9
Merge commit '831a1180785a786272cdcefb71566a770bfb879e'
...
* commit '831a1180785a786272cdcefb71566a770bfb879e':
Update dsputil- and SIMD-related comments to match reality more closely
Conflicts:
libavcodec/x86/hpeldsp.asm
libavutil/arm/float_dsp_init_arm.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-03-13 23:59:56 +01:00
Diego Biurrun
831a118078
Update dsputil- and SIMD-related comments to match reality more closely
2014-03-13 05:50:29 -07:00
Michael Niedermayer
c5a11ab6d1
Merge commit 'bfb41b5039e36b7f873d6ea7d24b31bf3e1a8075'
...
* commit 'bfb41b5039e36b7f873d6ea7d24b31bf3e1a8075':
bfin: hpeldsp: Move half-pel assembly from dsputil to hpeldsp
Conflicts:
libavcodec/bfin/Makefile
libavcodec/bfin/hpel_pixels_bfin.S
libavcodec/bfin/hpeldsp_bfin.c
libavcodec/bfin/hpeldsp_bfin.h
libavcodec/hpeldsp.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-04-20 14:31:11 +02:00
Ronald S. Bultje
bfb41b5039
bfin: hpeldsp: Move half-pel assembly from dsputil to hpeldsp
...
Signed-off-by: Martin Storsjö <martin@martin.st>
2013-04-19 23:19:13 +03:00
Ronald S. Bultje
e9e608ad58
Move bfin half-pel assembly from dsputil to hpeldsp.
2013-03-13 04:06:10 +01:00
