diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-02-28 17:54:32 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-02-28 18:02:00 +0100 |
| commit | 2e88f82a8a50b21a3273785ac1349fd94c1a8aa0 (patch) | |
| tree | 2b67d8e5bb10e18729dddfcd1a25b5ea13e17490 /libavcodec/proresdsp.h | |
| parent | 18d870da83b172c89495b6543001b2ecdf4ae1e2 (diff) | |
| parent | 92e598a57a7ce4b8ac9ea56274af39f5fd888311 (diff) | |
| download | ffmpeg-2e88f82a8a50b21a3273785ac1349fd94c1a8aa0.tar.gz | |
Merge commit '92e598a57a7ce4b8ac9ea56274af39f5fd888311'
* commit '92e598a57a7ce4b8ac9ea56274af39f5fd888311':
prores: Drop DSP infrastructure for prores encoder bits
Conflicts:
libavcodec/Makefile
libavcodec/proresdsp.c
libavcodec/proresenc_kostya.c
Note, these changes only affect one of the 2 prores encoders we have
If someone wants to add optimizations to the affected encoder, or needs/wants
this infrastructure, then iam happy to revert this
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/proresdsp.h')
| -rw-r--r-- | libavcodec/proresdsp.h | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/libavcodec/proresdsp.h b/libavcodec/proresdsp.h index 2b23f35ad1..07871cfbd8 100644 --- a/libavcodec/proresdsp.h +++ b/libavcodec/proresdsp.h @@ -32,7 +32,6 @@ typedef struct ProresDSPContext { int idct_permutation_type; uint8_t idct_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; void ff_proresdsp_init(ProresDSPContext *dsp, AVCodecContext *avctx); |