diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-03-20 22:06:01 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-03-20 22:06:01 +0100 |
| commit | ba85bfabf3a1b762b3e07f53d404f4c7c4e1703a (patch) | |
| tree | 3361491c371b328f0fb81231ab80e431d0ef986d /libavcodec/dsputil.h | |
| parent | a87188ebdb8307fb4733e04d482a3ae617bd9da4 (diff) | |
| parent | 5169e688956be3378adb3b16a93962fe0048f1c9 (diff) | |
Merge commit '5169e688956be3378adb3b16a93962fe0048f1c9'
* commit '5169e688956be3378adb3b16a93962fe0048f1c9':
dsputil: Propagate bit depth information to all (sub)init functions
Conflicts:
libavcodec/arm/dsputil_init_arm.c
libavcodec/arm/dsputil_init_armv5te.c
libavcodec/arm/dsputil_init_armv6.c
libavcodec/arm/dsputil_init_neon.c
libavcodec/dsputil.c
libavcodec/dsputil.h
libavcodec/ppc/dsputil_ppc.c
libavcodec/x86/dsputil_init.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/dsputil.h')
| -rw-r--r-- | libavcodec/dsputil.h | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/libavcodec/dsputil.h b/libavcodec/dsputil.h index a506956589..3f35e420f0 100644 --- a/libavcodec/dsputil.h +++ b/libavcodec/dsputil.h @@ -355,10 +355,14 @@ int ff_check_alignment(void); void ff_set_cmp(DSPContext *c, me_cmp_func *cmp, int type); void ff_dsputil_init_alpha(DSPContext* c, AVCodecContext *avctx); -void ff_dsputil_init_arm(DSPContext *c, AVCodecContext *avctx); -void ff_dsputil_init_bfin(DSPContext *c, AVCodecContext *avctx); -void ff_dsputil_init_ppc(DSPContext *c, AVCodecContext *avctx); -void ff_dsputil_init_x86(DSPContext *c, AVCodecContext *avctx); +void ff_dsputil_init_arm(DSPContext *c, AVCodecContext *avctx, + unsigned high_bit_depth); +void ff_dsputil_init_bfin(DSPContext *c, AVCodecContext *avctx, + unsigned high_bit_depth); +void ff_dsputil_init_ppc(DSPContext *c, AVCodecContext *avctx, + unsigned high_bit_depth); +void ff_dsputil_init_x86(DSPContext *c, AVCodecContext *avctx, + unsigned high_bit_depth); void ff_dsputil_init_dwt(DSPContext *c); |