From cb214707a6cb0d3272ec0261af6f1f5d8b7dabc7 Mon Sep 17 00:00:00 2001 From: Diego Biurrun Date: Wed, 14 Aug 2013 18:39:37 +0200 Subject: vp56data: Move all shared enum/struct declarations to common header --- libavcodec/vp56data.h | 27 +-------------------------- 1 file changed, 1 insertion(+), 26 deletions(-) (limited to 'libavcodec/vp56data.h') diff --git a/libavcodec/vp56data.h b/libavcodec/vp56data.h index ee3832293d..1285fba998 100644 --- a/libavcodec/vp56data.h +++ b/libavcodec/vp56data.h @@ -27,32 +27,7 @@ #define AVCODEC_VP56DATA_H #include "libavutil/common.h" - -typedef enum { - VP56_FRAME_NONE =-1, - VP56_FRAME_CURRENT = 0, - VP56_FRAME_PREVIOUS = 1, - VP56_FRAME_GOLDEN = 2, - VP56_FRAME_GOLDEN2 = 3, -} VP56Frame; - -typedef enum { - VP56_MB_INTER_NOVEC_PF = 0, /**< Inter MB, no vector, from previous frame */ - VP56_MB_INTRA = 1, /**< Intra MB */ - VP56_MB_INTER_DELTA_PF = 2, /**< Inter MB, above/left vector + delta, from previous frame */ - VP56_MB_INTER_V1_PF = 3, /**< Inter MB, first vector, from previous frame */ - VP56_MB_INTER_V2_PF = 4, /**< Inter MB, second vector, from previous frame */ - VP56_MB_INTER_NOVEC_GF = 5, /**< Inter MB, no vector, from golden frame */ - VP56_MB_INTER_DELTA_GF = 6, /**< Inter MB, above/left vector + delta, from golden frame */ - VP56_MB_INTER_4V = 7, /**< Inter MB, 4 vectors, from previous frame */ - VP56_MB_INTER_V1_GF = 8, /**< Inter MB, first vector, from golden frame */ - VP56_MB_INTER_V2_GF = 9, /**< Inter MB, second vector, from golden frame */ -} VP56mb; - -typedef struct VP56Tree { - int8_t val; - int8_t prob_idx; -} VP56Tree; +#include "vp56.h" extern const uint8_t ff_vp56_b2p[]; extern const uint8_t ff_vp56_b6to4[]; -- cgit v1.2.3