virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-08-15 14:13:16 +02:00
Code Issues Releases Activity

Merge commit '2b8b0da09cf0dc2535de42f95110eb633f36d8c8'

Browse Source 
* commit '2b8b0da09cf0dc2535de42f95110eb633f36d8c8':
  fdctdsp: cosmetics: Drop one unnecessary if-block level

Merged-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer
2014-09-04 19:10:28 +02:00
parent c4abee734d 2b8b0da09c
commit a52e74db17
1 changed files with 8 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
libavcodec/fdctdsp.c
View File

@@ -30,8 +30,7 @@ av_cold void ff_fdctdsp_init(FDCTDSPContext *c, AVCodecContext *avctx)
if (avctx->bits_per_raw_sample == 10) { if (avctx->bits_per_raw_sample == 10) {
c->fdct = ff_jpeg_fdct_islow_10; c->fdct = ff_jpeg_fdct_islow_10;
c->fdct248 = ff_fdct248_islow_10; c->fdct248 = ff_fdct248_islow_10;
} else { } else if (avctx->dct_algo == FF_DCT_FASTINT) {
if (avctx->dct_algo == FF_DCT_FASTINT) {
c->fdct = ff_fdct_ifast; c->fdct = ff_fdct_ifast;
c->fdct248 = ff_fdct_ifast248; c->fdct248 = ff_fdct_ifast248;
} else if (avctx->dct_algo == FF_DCT_FAAN) { } else if (avctx->dct_algo == FF_DCT_FAAN) {
@@ -41,7 +40,6 @@ av_cold void ff_fdctdsp_init(FDCTDSPContext *c, AVCodecContext *avctx)
c->fdct = ff_jpeg_fdct_islow_8; // slow/accurate/default c->fdct = ff_jpeg_fdct_islow_8; // slow/accurate/default
c->fdct248 = ff_fdct248_islow_8; c->fdct248 = ff_fdct248_islow_8;
} }
}
if (ARCH_PPC) if (ARCH_PPC)
ff_fdctdsp_init_ppc(c, avctx, high_bit_depth); ff_fdctdsp_init_ppc(c, avctx, high_bit_depth);