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/arm/dsputil_init_armv5te.c | |
| parent | a87188ebdb8307fb4733e04d482a3ae617bd9da4 (diff) | |
| parent | 5169e688956be3378adb3b16a93962fe0048f1c9 (diff) | |
| download | ffmpeg-ba85bfabf3a1b762b3e07f53d404f4c7c4e1703a.tar.gz | |
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/arm/dsputil_init_armv5te.c')
| -rw-r--r-- | libavcodec/arm/dsputil_init_armv5te.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/libavcodec/arm/dsputil_init_armv5te.c b/libavcodec/arm/dsputil_init_armv5te.c index fb47a404ad..883f6e40ad 100644 --- a/libavcodec/arm/dsputil_init_armv5te.c +++ b/libavcodec/arm/dsputil_init_armv5te.c @@ -29,9 +29,10 @@ void ff_simple_idct_armv5te(int16_t *data); void ff_simple_idct_put_armv5te(uint8_t *dest, int line_size, int16_t *data); void ff_simple_idct_add_armv5te(uint8_t *dest, int line_size, int16_t *data); -av_cold void ff_dsputil_init_armv5te(DSPContext *c, AVCodecContext *avctx) +av_cold void ff_dsputil_init_armv5te(DSPContext *c, AVCodecContext *avctx, + unsigned high_bit_depth) { - if (!avctx->lowres && avctx->bits_per_raw_sample <= 8 && + if (!avctx->lowres && !high_bit_depth && (avctx->idct_algo == FF_IDCT_AUTO || avctx->idct_algo == FF_IDCT_SIMPLEARMV5TE)) { c->idct_put = ff_simple_idct_put_armv5te; |