From 2b8b0da09cf0dc2535de42f95110eb633f36d8c8 Mon Sep 17 00:00:00 2001
From: Diego Biurrun <diego@biurrun.de>
Date: Thu, 28 Aug 2014 12:49:38 -0700
Subject: [PATCH] fdctdsp: cosmetics: Drop one unnecessary if-block level
---
libavcodec/fdctdsp.c | 18 ++++++++----------
1 file changed, 8 insertions(+), 10 deletions(-)
diff --git a/libavcodec/fdctdsp.c b/libavcodec/fdctdsp.c
index b245198b903..696fa01e946 100644
--- a/libavcodec/fdctdsp.c
+++ b/libavcodec/fdctdsp.c
@@ -30,17 +30,15 @@ av_cold void ff_fdctdsp_init(FDCTDSPContext *c, AVCodecContext *avctx)
if (avctx->bits_per_raw_sample == 10) {
c->fdct = ff_jpeg_fdct_islow_10;
c->fdct248 = ff_fdct248_islow_10;
+ } else if (avctx->dct_algo == FF_DCT_FASTINT) {
+ c->fdct = ff_fdct_ifast;
+ c->fdct248 = ff_fdct_ifast248;
+ } else if (avctx->dct_algo == FF_DCT_FAAN) {
+ c->fdct = ff_faandct;
+ c->fdct248 = ff_faandct248;
} else {
- if (avctx->dct_algo == FF_DCT_FASTINT) {
- c->fdct = ff_fdct_ifast;
- c->fdct248 = ff_fdct_ifast248;
- } else if (avctx->dct_algo == FF_DCT_FAAN) {
- c->fdct = ff_faandct;
- c->fdct248 = ff_faandct248;
- } else {
- c->fdct = ff_jpeg_fdct_islow_8; // slow/accurate/default
- c->fdct248 = ff_fdct248_islow_8;
- }
+ c->fdct = ff_jpeg_fdct_islow_8; // slow/accurate/default
+ c->fdct248 = ff_fdct248_islow_8;
}
if (ARCH_PPC)
--
GitLab