diff options
author | Michael Niedermayer <michaelni@gmx.at> | 2013-02-15 12:27:44 +0100 |
---|---|---|
committer | Michael Niedermayer <michaelni@gmx.at> | 2013-02-15 12:30:21 +0100 |
commit | f98598942f7ff14b8621e6f626acd0ad03c8f610 (patch) | |
tree | f327a66ce42902744fe9dd85cf4de729f969bf12 /libavcodec | |
parent | 048ecbd3f83362573231add2841084d3f56d37ba (diff) | |
parent | 3594554a064d76e3514fab9781c0e63ea9e08ea9 (diff) | |
download | ffmpeg-f98598942f7ff14b8621e6f626acd0ad03c8f610.tar.gz |
Merge remote-tracking branch 'qatar/master'
* qatar/master:
sparc: dsputil: Simplify high_bit_depth checks
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec')
-rw-r--r-- | libavcodec/sparc/dsputil_vis.c | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/libavcodec/sparc/dsputil_vis.c b/libavcodec/sparc/dsputil_vis.c index 93b53773dc..0ade237c82 100644 --- a/libavcodec/sparc/dsputil_vis.c +++ b/libavcodec/sparc/dsputil_vis.c @@ -3501,16 +3501,14 @@ av_cold void ff_dsputil_init_vis(DSPContext *c, AVCodecContext *avctx) int accel = vis_level (); const int high_bit_depth = avctx->bits_per_raw_sample > 8; - if (accel & ACCEL_SPARC_VIS) { - if (avctx->bits_per_raw_sample <= 8 && - avctx->idct_algo == FF_IDCT_SIMPLEVIS) { + if (accel & ACCEL_SPARC_VIS && !high_bit_depth) { + if (avctx->idct_algo == FF_IDCT_SIMPLEVIS) { c->idct_put = ff_simple_idct_put_vis; c->idct_add = ff_simple_idct_add_vis; c->idct = ff_simple_idct_vis; c->idct_permutation_type = FF_TRANSPOSE_IDCT_PERM; } - if (!high_bit_depth) { c->put_pixels_tab[0][0] = MC_put_o_16_vis; c->put_pixels_tab[0][1] = MC_put_x_16_vis; c->put_pixels_tab[0][2] = MC_put_y_16_vis; @@ -3545,6 +3543,5 @@ av_cold void ff_dsputil_init_vis(DSPContext *c, AVCodecContext *avctx) c->avg_no_rnd_pixels_tab[1] = MC_avg_no_round_x_16_vis; c->avg_no_rnd_pixels_tab[2] = MC_avg_no_round_y_16_vis; c->avg_no_rnd_pixels_tab[3] = MC_avg_no_round_xy_16_vis; - } } } |