From 3594554a064d76e3514fab9781c0e63ea9e08ea9 Mon Sep 17 00:00:00 2001
From: Diego Biurrun <diego@biurrun.de>
Date: Fri, 15 Feb 2013 02:13:42 +0100
Subject: [PATCH] sparc: dsputil: Simplify high_bit_depth checks
---
libavcodec/sparc/dsputil_vis.c | 7 ++-----
1 file changed, 2 insertions(+), 5 deletions(-)
diff --git a/libavcodec/sparc/dsputil_vis.c b/libavcodec/sparc/dsputil_vis.c
index 26a54b0ce63..b1f85ba8d0e 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;
- }
}
}
--
GitLab