diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-02-28 17:26:37 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-02-28 17:26:37 +0100 |
| commit | 18d870da83b172c89495b6543001b2ecdf4ae1e2 (patch) | |
| tree | 4728252b4549ba0ebb0b7ce03a6d04d29c7d4a41 /libavcodec/proresdsp.c | |
| parent | 5ba1648318161b394499a04e8fc7385ee2fbf375 (diff) | |
| parent | d6acefe05862af244fd5a30ae946ed507c063994 (diff) | |
| download | ffmpeg-18d870da83b172c89495b6543001b2ecdf4ae1e2.tar.gz | |
Merge commit 'd6acefe05862af244fd5a30ae946ed507c063994'
* commit 'd6acefe05862af244fd5a30ae946ed507c063994':
proresenc: Drop unnecessary DCT permutation bits
Conflicts:
libavcodec/proresenc_kostya.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/proresdsp.c')
| -rw-r--r-- | libavcodec/proresdsp.c | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/libavcodec/proresdsp.c b/libavcodec/proresdsp.c index 99f259bc8a..f6246331fb 100644 --- a/libavcodec/proresdsp.c +++ b/libavcodec/proresdsp.c @@ -86,8 +86,5 @@ av_cold void ff_proresdsp_init(ProresDSPContext *dsp, AVCodecContext *avctx) #endif #if CONFIG_PRORES_KS_ENCODER dsp->fdct = prores_fdct_c; - dsp->dct_permutation_type = FF_NO_IDCT_PERM; - ff_init_scantable_permutation(dsp->dct_permutation, - dsp->dct_permutation_type); #endif } |