Michael Niedermayer
eda9d97b7a
Merge commit '46bb456853b197f4562de7acf5d42abf11ded9be'
...
* commit '46bb456853b197f4562de7acf5d42abf11ded9be':
x86: dsputil: Refactor pixels16 wrapper functions with a macro
Conflicts:
libavcodec/x86/hpeldsp_avg_template.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-05-14 10:18:46 +02:00
Diego Biurrun
46bb456853
x86: dsputil: Refactor pixels16 wrapper functions with a macro
2013-05-12 22:28:07 +02:00
Michael Niedermayer
2f9ef60c97
Merge commit '92f8e06ecb431a427ea13d794e5a6bc927a034d2'
...
* commit '92f8e06ecb431a427ea13d794e5a6bc927a034d2':
x86: dsputil hpeldsp: Move shared template functions into separate object
Conflicts:
libavcodec/x86/Makefile
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-05-08 14:01:58 +02:00
Michael Niedermayer
bf18810a21
Merge commit '7edaf4edb5c3c04f34ad1242680cbc32d11f4087'
...
* commit '7edaf4edb5c3c04f34ad1242680cbc32d11f4087':
x86: rnd_template: Eliminate pointless OP_AVG macro indirection
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-05-08 13:55:31 +02:00
Diego Biurrun
92f8e06ecb
x86: dsputil hpeldsp: Move shared template functions into separate object
2013-05-07 18:03:34 +02:00
Diego Biurrun
7edaf4edb5
x86: rnd_template: Eliminate pointless OP_AVG macro indirection
2013-05-07 18:03:34 +02:00
Michael Niedermayer
35ef98013d
Merge commit '932806232108872655556100011fe369125805d3'
...
* commit '932806232108872655556100011fe369125805d3':
x86: dsputil: Move avg_pixels16_mmx() out of rnd_template.c
x86: dsputil: Move avg_pixels8_mmx() out of rnd_template.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-05-03 10:44:09 +02:00
Diego Biurrun
9328062321
x86: dsputil: Move avg_pixels16_mmx() out of rnd_template.c
...
The function does not do any rounding, so there is no point in
keeping it in a round template file.
2013-05-02 11:45:37 +02:00
Diego Biurrun
9c112a6158
x86: dsputil: Move avg_pixels8_mmx() out of rnd_template.c
...
The function is only instantiated once, so there is no point
in keeping it in a template file.
2013-05-02 11:45:37 +02:00
Michael Niedermayer
721ffc691a
Merge remote-tracking branch 'qatar/master'
...
* commit '74685f6783e77f2545d48bd2124945ad5be39982':
x86: Rename dsputil_rnd_template.c to rnd_template.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-04-26 11:10:57 +02:00
Martin Storsjö
74685f6783
x86: Rename dsputil_rnd_template.c to rnd_template.c
...
This makes it less confusing when this template is shared both by
dsputil and by hpeldsp.
Signed-off-by: Martin Storsjö <martin@martin.st>
2013-04-25 23:03:09 +03:00
