Michael Niedermayer
77bc342975
Merge commit '322a1dda973e802db7b57f2007fad3efcd5bab81'
...
* commit '322a1dda973e802db7b57f2007fad3efcd5bab81':
dsputil: Refactor duplicated CALL_2X_PIXELS / PIXELS16 macros
Conflicts:
libavcodec/arm/hpeldsp_init_arm.c
libavcodec/x86/dsputil_x86.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-03-22 22:53:33 +01:00
Diego Biurrun
322a1dda97
dsputil: Refactor duplicated CALL_2X_PIXELS / PIXELS16 macros
2014-03-22 06:17:29 -07:00
Michael Niedermayer
75cc29a8a8
Merge commit 'cce791b17becc99f47e097adb93f4b4bbd382e7e'
...
* commit 'cce791b17becc99f47e097adb93f4b4bbd382e7e':
hpeldsp_template: Merge some declarations and initializations
Conflicts:
libavcodec/hpeldsp_template.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-03-20 21:08:30 +01:00
Michael Niedermayer
76d7676fcc
Merge commit '2539cf1c814190a017cb8986b41aa2f949e37fd9'
...
* commit '2539cf1c814190a017cb8986b41aa2f949e37fd9':
hpeldsp_template: K&R formatting cosmetics
Conflicts:
libavcodec/hpeldsp_template.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-03-20 20:52:19 +01:00
Diego Biurrun
cce791b17b
hpeldsp_template: Merge some declarations and initializations
2014-03-20 05:03:22 -07:00
Diego Biurrun
2539cf1c81
hpeldsp_template: K&R formatting cosmetics
2014-03-20 05:03:22 -07:00
Ronald S. Bultje
68d8238cca
hpeldsp: Add half-pel functions (currently copies of dsputil)
...
Signed-off-by: Martin Storsjö <martin@martin.st>
2013-04-19 23:17:17 +03:00
Ronald S. Bultje
9628e5a4ac
hpeldsp: add half-pel functions (currently copies of dsputil).
2013-03-13 03:54:47 +01:00