From f7813a5324be39d13ab536c245d15dfc602a7849 Mon Sep 17 00:00:00 2001 From: Tim Redfern Date: Sun, 29 Dec 2013 12:19:38 +0000 Subject: basic type mechanism working --- ffmpeg/libavcodec/vp8.h | 16 +++++++++++----- 1 file changed, 11 insertions(+), 5 deletions(-) (limited to 'ffmpeg/libavcodec/vp8.h') diff --git a/ffmpeg/libavcodec/vp8.h b/ffmpeg/libavcodec/vp8.h index 90109ad..c9a7906 100644 --- a/ffmpeg/libavcodec/vp8.h +++ b/ffmpeg/libavcodec/vp8.h @@ -29,16 +29,15 @@ #include "libavutil/buffer.h" #include "vp56.h" -#include "vp56data.h" #include "vp8dsp.h" #include "h264pred.h" #include "thread.h" #if HAVE_PTHREADS #include -#elif HAVE_W32THREADS -#include "w32pthreads.h" #elif HAVE_OS2THREADS -#include "os2threads.h" +#include "compat/os2threads.h" +#elif HAVE_W32THREADS +#include "compat/w32pthreads.h" #endif #define VP8_MAX_QUANT 127 @@ -123,7 +122,7 @@ typedef struct VP8ThreadData { #endif int thread_mb_pos; // (mb_y << 16) | (mb_x & 0xFFFF) int wait_mb_pos; // What the current thread is waiting on. - uint8_t *edge_emu_buffer; + DECLARE_ALIGNED(16, uint8_t, edge_emu_buffer)[21*32]; VP8FilterStrength *filter_strength; } VP8ThreadData; @@ -272,4 +271,11 @@ typedef struct VP8Context { int mb_layout; } VP8Context; +int ff_vp8_decode_init(AVCodecContext *avctx); + +int ff_vp8_decode_frame(AVCodecContext *avctx, void *data, int *got_frame, + AVPacket *avpkt); + +int ff_vp8_decode_free(AVCodecContext *avctx); + #endif /* AVCODEC_VP8_H */ -- cgit v1.2.3