Merge commit '92e598a57a7ce4b8ac9ea56274af39f5fd888311'

[ffmpeg] / libavcodec / proresdsp.h

diff --git a/libavcodec/proresdsp.h b/libavcodec/proresdsp.h
index 706162af5291e56c7889158f99ce322a592b26b7..07871cfbd82c144c4390ca97c47d5f74d60ef3b8 100644 (file)
--- a/libavcodec/proresdsp.h
+++ b/libavcodec/proresdsp.h
@@ -31,14 +31,11 @@
 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;
 
 void ff_proresdsp_init(ProresDSPContext *dsp, AVCodecContext *avctx);
 
-void ff_proresdsp_x86_init(ProresDSPContext *dsp, AVCodecContext *avctx);
+void ff_proresdsp_init_x86(ProresDSPContext *dsp, AVCodecContext *avctx);
 
 #endif /* AVCODEC_PRORESDSP_H */