diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-09-04 19:10:28 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-09-04 19:10:33 +0200 |
| commit | a52e74db17e56a49464d36c9168f5fea5ce2be02 (patch) | |
| tree | cf29a7429693527704f08f2a622bc0a1534cd693 /libavcodec/fdctdsp.c | |
| parent | c4abee734dcbdb589925dd6da98041dcf663ce49 (diff) | |
| parent | 2b8b0da09cf0dc2535de42f95110eb633f36d8c8 (diff) | |
| download | ffmpeg-a52e74db17e56a49464d36c9168f5fea5ce2be02.tar.gz | |
Merge commit '2b8b0da09cf0dc2535de42f95110eb633f36d8c8'
* commit '2b8b0da09cf0dc2535de42f95110eb633f36d8c8':
fdctdsp: cosmetics: Drop one unnecessary if-block level
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/fdctdsp.c')
| -rw-r--r-- | libavcodec/fdctdsp.c | 18 |
1 files changed, 8 insertions, 10 deletions
diff --git a/libavcodec/fdctdsp.c b/libavcodec/fdctdsp.c index f75eed5086..80acca333d 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) |