diff options
| author | XhmikosR <xhmikosr@users.sourceforge.net> | 2010-07-01 22:43:43 +0400 |
|---|---|---|
| committer | XhmikosR <xhmikosr@users.sourceforge.net> | 2010-07-01 22:43:43 +0400 |
| commit | a260f0cb99fc88f9ebdee5893d90132cf13650e0 (patch) | |
| tree | e4629ac1113fe044c635fc348504f500e481dcfa /src/filters/transform/MPCVideoDec/ffmpeg/libavcodec/vp8data.h | |
| parent | 5a9717449b04649884a7394cc84c34d03450961e (diff) | |
updated ffmpeg
git-svn-id: https://mpc-hc.svn.sourceforge.net/svnroot/mpc-hc/trunk@2095 10f7b99b-c216-0410-bff0-8a66a9350fd8
Diffstat (limited to 'src/filters/transform/MPCVideoDec/ffmpeg/libavcodec/vp8data.h')
| -rw-r--r-- | src/filters/transform/MPCVideoDec/ffmpeg/libavcodec/vp8data.h | 15 |
1 files changed, 12 insertions, 3 deletions
diff --git a/src/filters/transform/MPCVideoDec/ffmpeg/libavcodec/vp8data.h b/src/filters/transform/MPCVideoDec/ffmpeg/libavcodec/vp8data.h index 110061f0e..5d718b4bb 100644 --- a/src/filters/transform/MPCVideoDec/ffmpeg/libavcodec/vp8data.h +++ b/src/filters/transform/MPCVideoDec/ffmpeg/libavcodec/vp8data.h @@ -72,9 +72,18 @@ enum inter_splitmvmode { static const uint8_t vp8_pred4x4_mode[] = { -/* MPC custom code start */ - DC_PRED, HOR_PRED, VERT_PRED, TM_VP8_PRED -/* MPC custom code end */ +#if __STDC_VERSION__ >= 199901L + [DC_PRED8x8] = DC_PRED, + [VERT_PRED8x8] = VERT_PRED, + [HOR_PRED8x8] = HOR_PRED, + [PLANE_PRED8x8] = TM_VP8_PRED, +#else + /* see h264pred.h for the correct order */ + DC_PRED, + HOR_PRED, + VERT_PRED, + TM_VP8_PRED, +#endif }; static const int8_t vp8_pred16x16_tree_intra[4][2] = |