Merge commit 'cc4992aaf3dbb0af88d9727983d75636baf1f8cc'

[ffmpeg] / libavcodec / idctdsp.h

diff --git a/libavcodec/idctdsp.h b/libavcodec/idctdsp.h
index 9df13c5c5aba45517fc63c3acca8dfef7587c9db..538b71669cacc9aa9264b3da1e7b98ffdb578930 100644 (file)
--- a/libavcodec/idctdsp.h
+++ b/libavcodec/idctdsp.h
@@ -48,22 +48,17 @@ void ff_init_scantable_permutation(uint8_t *idct_permutation,
 int ff_init_scantable_permutation_x86(uint8_t *idct_permutation,
                                       enum idct_permutation_type perm_type);
 
-void ff_put_pixels_clamped(const int16_t *block, uint8_t *av_restrict pixels,
-                           int line_size);
-void ff_add_pixels_clamped(const int16_t *block, uint8_t *av_restrict pixels,
-                           int line_size);
-
 typedef struct IDCTDSPContext {
     /* pixel ops : interface with DCT */
     void (*put_pixels_clamped)(const int16_t *block /* align 16 */,
                                uint8_t *pixels /* align 8 */,
-                               int line_size);
+                               ptrdiff_t line_size);
     void (*put_signed_pixels_clamped)(const int16_t *block /* align 16 */,
                                       uint8_t *pixels /* align 8 */,
-                                      int line_size);
+                                      ptrdiff_t line_size);
     void (*add_pixels_clamped)(const int16_t *block /* align 16 */,
                                uint8_t *pixels /* align 8 */,
-                               int line_size);
+                               ptrdiff_t line_size);
 
     void (*idct)(int16_t *block /* align 16 */);
 
@@ -100,6 +95,9 @@ typedef struct IDCTDSPContext {
     enum idct_permutation_type perm_type;
 } IDCTDSPContext;
 
+extern void (*ff_put_pixels_clamped)(const int16_t *block, uint8_t *pixels, ptrdiff_t line_size);
+extern void (*ff_add_pixels_clamped)(const int16_t *block, uint8_t *pixels, ptrdiff_t line_size);
+
 void ff_idctdsp_init(IDCTDSPContext *c, AVCodecContext *avctx);
 
 void ff_idctdsp_init_alpha(IDCTDSPContext *c, AVCodecContext *avctx,