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/arm/idctdsp_init_arm.c | |
| parent | 42d326353c17085a98f0e81844f0c6320d70e8f3 (diff) | |
| parent | 8b0dd4942aac320d1ca3c40fa7ea1be342c71273 (diff) | |
| download | ffmpeg-streaming-521f5697348d96ac7c725bc2cba14d6ce4944334.zip ffmpeg-streaming-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/arm/idctdsp_init_arm.c')
| -rw-r--r-- | libavcodec/arm/idctdsp_init_arm.c | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/libavcodec/arm/idctdsp_init_arm.c b/libavcodec/arm/idctdsp_init_arm.c index 0eebe2a..4d15cf5 100644 --- a/libavcodec/arm/idctdsp_init_arm.c +++ b/libavcodec/arm/idctdsp_init_arm.c @@ -75,15 +75,15 @@ av_cold void ff_idctdsp_init_arm(IDCTDSPContext *c, AVCodecContext *avctx, if (!avctx->lowres && !high_bit_depth) { if (avctx->idct_algo == FF_IDCT_AUTO || avctx->idct_algo == FF_IDCT_ARM) { - c->idct_put = j_rev_dct_arm_put; - c->idct_add = j_rev_dct_arm_add; - c->idct = ff_j_rev_dct_arm; - c->perm_type = FF_IDCT_PERM_LIBMPEG2; + c->idct_put = j_rev_dct_arm_put; + c->idct_add = j_rev_dct_arm_add; + c->idct = ff_j_rev_dct_arm; + c->perm_type = FF_IDCT_PERM_LIBMPEG2; } else if (avctx->idct_algo == FF_IDCT_SIMPLEARM) { - c->idct_put = simple_idct_arm_put; - c->idct_add = simple_idct_arm_add; - c->idct = ff_simple_idct_arm; - c->perm_type = FF_IDCT_PERM_NONE; + c->idct_put = simple_idct_arm_put; + c->idct_add = simple_idct_arm_add; + c->idct = ff_simple_idct_arm; + c->perm_type = FF_IDCT_PERM_NONE; } } |
