diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-07-18 22:16:04 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-07-18 22:16:04 +0200 |
| commit | 521f5697348d96ac7c725bc2cba14d6ce4944334 (patch) | |
| tree | 6ab1a8b2b02141859532a4b5d9e35d5a3188e02d /libavcodec/idctdsp.c | |
| parent | 42d326353c17085a98f0e81844f0c6320d70e8f3 (diff) | |
| parent | 8b0dd4942aac320d1ca3c40fa7ea1be342c71273 (diff) | |
| download | ffmpeg-521f5697348d96ac7c725bc2cba14d6ce4944334.tar.gz | |
Merge commit '8b0dd4942aac320d1ca3c40fa7ea1be342c71273'
* commit '8b0dd4942aac320d1ca3c40fa7ea1be342c71273':
idctdsp: prettyprinting cosmetics
Conflicts:
libavcodec/idctdsp.c
libavcodec/ppc/idctdsp.c
libavcodec/x86/idctdsp_init.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/idctdsp.c')
| -rw-r--r-- | libavcodec/idctdsp.c | 48 |
1 files changed, 24 insertions, 24 deletions
diff --git a/libavcodec/idctdsp.c b/libavcodec/idctdsp.c index feefc34983..e91ba2e6c8 100644 --- a/libavcodec/idctdsp.c +++ b/libavcodec/idctdsp.c @@ -250,20 +250,20 @@ av_cold void ff_idctdsp_init(IDCTDSPContext *c, AVCodecContext *avctx) const unsigned high_bit_depth = avctx->bits_per_raw_sample > 8; if (avctx->lowres==1) { - c->idct_put = ff_jref_idct4_put; - c->idct_add = ff_jref_idct4_add; - c->idct = ff_j_rev_dct4; - c->perm_type = FF_IDCT_PERM_NONE; + c->idct_put = ff_jref_idct4_put; + c->idct_add = ff_jref_idct4_add; + c->idct = ff_j_rev_dct4; + c->perm_type = FF_IDCT_PERM_NONE; } else if (avctx->lowres==2) { - c->idct_put = ff_jref_idct2_put; - c->idct_add = ff_jref_idct2_add; - c->idct = ff_j_rev_dct2; - c->perm_type = FF_IDCT_PERM_NONE; + c->idct_put = ff_jref_idct2_put; + c->idct_add = ff_jref_idct2_add; + c->idct = ff_j_rev_dct2; + c->perm_type = FF_IDCT_PERM_NONE; } else if (avctx->lowres==3) { - c->idct_put = ff_jref_idct1_put; - c->idct_add = ff_jref_idct1_add; - c->idct = ff_j_rev_dct1; - c->perm_type = FF_IDCT_PERM_NONE; + c->idct_put = ff_jref_idct1_put; + c->idct_add = ff_jref_idct1_add; + c->idct = ff_j_rev_dct1; + c->perm_type = FF_IDCT_PERM_NONE; } else { if (avctx->bits_per_raw_sample == 10) { c->idct_put = ff_simple_idct_put_10; @@ -277,20 +277,20 @@ av_cold void ff_idctdsp_init(IDCTDSPContext *c, AVCodecContext *avctx) c->perm_type = FF_IDCT_PERM_NONE; } else { if (avctx->idct_algo == FF_IDCT_INT) { - c->idct_put = jref_idct_put; - c->idct_add = jref_idct_add; - c->idct = ff_j_rev_dct; - c->perm_type = FF_IDCT_PERM_LIBMPEG2; + c->idct_put = jref_idct_put; + c->idct_add = jref_idct_add; + c->idct = ff_j_rev_dct; + c->perm_type = FF_IDCT_PERM_LIBMPEG2; } else if (avctx->idct_algo == FF_IDCT_FAAN) { - c->idct_put = ff_faanidct_put; - c->idct_add = ff_faanidct_add; - c->idct = ff_faanidct; - c->perm_type = FF_IDCT_PERM_NONE; + c->idct_put = ff_faanidct_put; + c->idct_add = ff_faanidct_add; + c->idct = ff_faanidct; + c->perm_type = FF_IDCT_PERM_NONE; } else { // accurate/default - c->idct_put = ff_simple_idct_put_8; - c->idct_add = ff_simple_idct_add_8; - c->idct = ff_simple_idct_8; - c->perm_type = FF_IDCT_PERM_NONE; + c->idct_put = ff_simple_idct_put_8; + c->idct_add = ff_simple_idct_add_8; + c->idct = ff_simple_idct_8; + c->perm_type = FF_IDCT_PERM_NONE; } } } |