Merge commit 'b42f49e42f8cde25a788b2d13d03e99ca2956647'

[ffmpeg] / libavcodec / vp8dsp.h

diff --git a/libavcodec/vp8dsp.h b/libavcodec/vp8dsp.h
index 02ac77802a5b5c19817d94b6d915edfc40adb34d..5fdd3af70da20bfc887ff8643aac1af61f4d297d 100644 (file)
--- a/libavcodec/vp8dsp.h
+++ b/libavcodec/vp8dsp.h
@@ -30,8 +30,8 @@
 #include <stddef.h>
 #include <stdint.h>
 
-typedef void (*vp8_mc_func)(uint8_t *dst/*align 8*/, ptrdiff_t dstStride,
-                            uint8_t *src/*align 1*/, ptrdiff_t srcStride,
+typedef void (*vp8_mc_func)(uint8_t *dst /* align 8 */, ptrdiff_t dstStride,
+                            uint8_t *src /* align 1 */, ptrdiff_t srcStride,
                             int h, int x, int y);
 
 typedef struct VP8DSPContext {
@@ -88,9 +88,18 @@ void ff_put_vp8_pixels8_c(uint8_t *dst, uint8_t *src, ptrdiff_t stride,
 void ff_put_vp8_pixels4_c(uint8_t *dst, uint8_t *src, ptrdiff_t stride,
                           int h, int x, int y);
 
-void ff_vp8dsp_init(VP8DSPContext *c, int vp7);
-void ff_vp8dsp_init_x86(VP8DSPContext *c, int vp7);
-void ff_vp8dsp_init_arm(VP8DSPContext *c, int vp7);
-void ff_vp8dsp_init_ppc(VP8DSPContext *c);
+void ff_vp7dsp_init(VP8DSPContext *c);
+
+void ff_vp78dsp_init(VP8DSPContext *c);
+void ff_vp78dsp_init_arm(VP8DSPContext *c);
+void ff_vp78dsp_init_ppc(VP8DSPContext *c);
+void ff_vp78dsp_init_x86(VP8DSPContext *c);
+
+void ff_vp8dsp_init(VP8DSPContext *c);
+void ff_vp8dsp_init_arm(VP8DSPContext *c);
+void ff_vp8dsp_init_x86(VP8DSPContext *c);
+
+#define IS_VP7 1
+#define IS_VP8 0
 
 #endif /* AVCODEC_VP8DSP_H */