aboutsummaryrefslogtreecommitdiffstats
path: root/libavcodec/fdctdsp.c
diff options
context:
space:
mode:
authorDiego Biurrun <diego@biurrun.de>2014-08-28 12:49:38 -0700
committerDiego Biurrun <diego@biurrun.de>2014-09-03 03:13:56 -0700
commit2b8b0da09cf0dc2535de42f95110eb633f36d8c8 (patch)
tree5a71350a6a12909ad6e6c8bc25c488d15a3de5d8 /libavcodec/fdctdsp.c
parentd2a4e4b9cc9a0c2661e1c1d6f6b51babac2cec1b (diff)
downloadffmpeg-2b8b0da09cf0dc2535de42f95110eb633f36d8c8.tar.gz
fdctdsp: cosmetics: Drop one unnecessary if-block level
Diffstat (limited to 'libavcodec/fdctdsp.c')
-rw-r--r--libavcodec/fdctdsp.c18
1 files changed, 8 insertions, 10 deletions
diff --git a/libavcodec/fdctdsp.c b/libavcodec/fdctdsp.c
index b245198b90..696fa01e94 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)