Michael Niedermayer
9d6a27d533
Merge commit '57f09608e1600d1cf1679885a46f5004d522d68f'
...
* commit '57f09608e1600d1cf1679885a46f5004d522d68f':
dsputil: Move thirdpel-related bits into their own context
Conflicts:
libavcodec/svq3.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-03-22 23:26:23 +01:00
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
57f09608e1
dsputil: Move thirdpel-related bits into their own context
2014-03-22 06:17:30 -07:00
Diego Biurrun
322a1dda97
dsputil: Refactor duplicated CALL_2X_PIXELS / PIXELS16 macros
2014-03-22 06:17:29 -07:00
Michael Niedermayer
8b66b43128
Merge commit '2972087e398454122a82a970ed07924185175c6d'
...
* commit '2972087e398454122a82a970ed07924185175c6d':
hpel_template: Drop some unnecessary parentheses
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-03-20 20:50:04 +01:00
Michael Niedermayer
da760a64d1
Merge commit 'e8eace32765da4b42ac3c575fdb2c70cce8aa224'
...
* commit 'e8eace32765da4b42ac3c575fdb2c70cce8aa224':
hpel_template: K&R formatting cosmetics
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-03-20 20:32:27 +01:00
Diego Biurrun
2972087e39
hpel_template: Drop some unnecessary parentheses
2014-03-20 05:03:22 -07:00
Diego Biurrun
e8eace3276
hpel_template: K&R formatting cosmetics
2014-03-20 05:03:22 -07:00
Luca Barbato
0b70fb1d51
dsputil: convert remaining op_pixels_func
...
Convert to diffptr_t the line_size parameters still int.
Remove all the warnings in dsputil.c
2013-02-17 12:03:24 +01:00
Michael Niedermayer
0ddca7d416
dsputil: fixup half a dozen bugs with ptrdiff vs int linesize
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-02-06 13:22:19 +01:00
Michael Niedermayer
fc13a89654
Merge remote-tracking branch 'qatar/master'
...
* qatar/master:
dsputil: Separate h264 qpel
Conflicts:
libavcodec/dsputil_template.c
libavcodec/h264.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-01-24 15:47:47 +01:00
Mans Rullgard
e9d817351b
dsputil: Separate h264 qpel
...
The sh4 optimizations are removed, because the code is
100% identical to the C code, so it is unlikely to
provide any real practical benefit.
Signed-off-by: Diego Biurrun <diego@biurrun.de>
Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
2013-01-24 10:44:43 +01:00
