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.h | |
| parent | 5ba1648318161b394499a04e8fc7385ee2fbf375 (diff) | |
| parent | d6acefe05862af244fd5a30ae946ed507c063994 (diff) | |
| download | ffmpeg-streaming-18d870da83b172c89495b6543001b2ecdf4ae1e2.zip ffmpeg-streaming-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.h')
| -rw-r--r-- | libavcodec/proresdsp.h | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/libavcodec/proresdsp.h b/libavcodec/proresdsp.h index 733d474..2b23f35 100644 --- a/libavcodec/proresdsp.h +++ b/libavcodec/proresdsp.h @@ -31,8 +31,6 @@ typedef struct ProresDSPContext { int idct_permutation_type; uint8_t idct_permutation[64]; - int dct_permutation_type; - uint8_t dct_permutation[64]; void (* idct_put) (uint16_t *out, int linesize, int16_t *block, const int16_t *qmat); void (* fdct) (const uint16_t *src, int linesize, int16_t *block); } ProresDSPContext; |
