diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-04-20 14:29:16 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-04-20 14:31:11 +0200 |
| commit | c5a11ab6d1067f8306b318b9fda10b106389cea0 (patch) | |
| tree | e446d1af6c80b81af25bfe5e919965fd6e1778cf /libavcodec | |
| parent | c4010972c4a7bd1f5f38cf8a75faf7a57da10ee9 (diff) | |
| parent | bfb41b5039e36b7f873d6ea7d24b31bf3e1a8075 (diff) | |
| download | ffmpeg-streaming-c5a11ab6d1067f8306b318b9fda10b106389cea0.zip ffmpeg-streaming-c5a11ab6d1067f8306b318b9fda10b106389cea0.tar.gz | |
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>
Diffstat (limited to 'libavcodec')
| -rw-r--r-- | libavcodec/bfin/Makefile | 2 | ||||
| -rw-r--r-- | libavcodec/bfin/hpel_pixels_bfin.S | 2 | ||||
| -rw-r--r-- | libavcodec/bfin/hpeldsp_bfin.c | 6 | ||||
| -rw-r--r-- | libavcodec/hpeldsp.c | 12 | ||||
| -rw-r--r-- | libavcodec/hpeldsp.h | 2 |
5 files changed, 16 insertions, 8 deletions
diff --git a/libavcodec/bfin/Makefile b/libavcodec/bfin/Makefile index f7a5f42..c293360 100644 --- a/libavcodec/bfin/Makefile +++ b/libavcodec/bfin/Makefile @@ -3,7 +3,7 @@ OBJS += bfin/dsputil_bfin.o \ bfin/idct_bfin.o \ bfin/pixels_bfin.o \ -OBJS-$(CONFIG_HPELDS) += bfin/hpeldsp_bfin.o \ +OBJS-$(CONFIG_HPELDSP) += bfin/hpeldsp_bfin.o \ bfin/hpel_pixels_bfin.o OBJS-$(CONFIG_MPEGVIDEOENC) += bfin/mpegvideo_bfin.o OBJS-$(CONFIG_VP3DSP) += bfin/vp3_bfin.o \ diff --git a/libavcodec/bfin/hpel_pixels_bfin.S b/libavcodec/bfin/hpel_pixels_bfin.S index b22bc29..c0cbf1f 100644 --- a/libavcodec/bfin/hpel_pixels_bfin.S +++ b/libavcodec/bfin/hpel_pixels_bfin.S @@ -20,7 +20,7 @@ */ #include "config_bfin.h" -/** +/* motion compensation primitives diff --git a/libavcodec/bfin/hpeldsp_bfin.c b/libavcodec/bfin/hpeldsp_bfin.c index 8b4af49..2df551b 100644 --- a/libavcodec/bfin/hpeldsp_bfin.c +++ b/libavcodec/bfin/hpeldsp_bfin.c @@ -21,6 +21,10 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ +#include <stddef.h> +#include <stdint.h> + +#include "libavutil/attributes.h" #include "libavcodec/hpeldsp.h" #include "hpeldsp_bfin.h" @@ -95,7 +99,7 @@ static void bfin_put_pixels16_y2_nornd (uint8_t *block, const uint8_t *pixels, p ff_bfin_put_pixels16uc_nornd (block, pixels, pixels+line_size, line_size, h); } -void ff_hpeldsp_init_bfin(HpelDSPContext* c, int flags) +av_cold void ff_hpeldsp_init_bfin(HpelDSPContext *c, int flags) { c->put_pixels_tab[0][0] = bfin_put_pixels16; c->put_pixels_tab[0][1] = bfin_put_pixels16_x2; diff --git a/libavcodec/hpeldsp.c b/libavcodec/hpeldsp.c index a01b322..bff779d 100644 --- a/libavcodec/hpeldsp.c +++ b/libavcodec/hpeldsp.c @@ -54,14 +54,18 @@ av_cold void ff_hpeldsp_init(HpelDSPContext *c, int flags) hpel_funcs(avg, [3], 2); hpel_funcs(avg_no_rnd,, 16); + if (ARCH_ALPHA) + ff_hpeldsp_init_alpha(c, flags); if (ARCH_ARM) ff_hpeldsp_init_arm(c, flags); + if (ARCH_BFIN) + ff_hpeldsp_init_bfin(c, flags); if (ARCH_PPC) ff_hpeldsp_init_ppc(c, flags); + if (ARCH_SH4) + ff_hpeldsp_init_sh4(c, flags); + if (HAVE_VIS) + ff_hpeldsp_init_vis(c, flags); if (ARCH_X86) ff_hpeldsp_init_x86(c, flags); - if (HAVE_VIS) ff_hpeldsp_init_vis (c, flags); - if (ARCH_ALPHA) ff_hpeldsp_init_alpha (c, flags); - if (ARCH_SH4) ff_hpeldsp_init_sh4 (c, flags); - if (ARCH_BFIN) ff_hpeldsp_init_bfin (c, flags); } diff --git a/libavcodec/hpeldsp.h b/libavcodec/hpeldsp.h index a6a2ff0..bd53edd 100644 --- a/libavcodec/hpeldsp.h +++ b/libavcodec/hpeldsp.h @@ -100,9 +100,9 @@ void ff_hpeldsp_init(HpelDSPContext *c, int flags); void ff_hpeldsp_init_alpha(HpelDSPContext* c, int flags); void ff_hpeldsp_init_arm(HpelDSPContext* c, int flags); void ff_hpeldsp_init_bfin(HpelDSPContext* c, int flags); -void ff_hpeldsp_init_x86(HpelDSPContext* c, int flags); void ff_hpeldsp_init_ppc(HpelDSPContext* c, int flags); void ff_hpeldsp_init_sh4(HpelDSPContext* c, int flags); void ff_hpeldsp_init_vis(HpelDSPContext* c, int flags); +void ff_hpeldsp_init_x86(HpelDSPContext* c, int flags); #endif /* AVCODEC_HPELDSP_H */ |
