diff options
| author | XhmikosR <xhmikosr@users.sourceforge.net> | 2010-06-29 02:20:20 +0400 |
|---|---|---|
| committer | XhmikosR <xhmikosr@users.sourceforge.net> | 2010-06-29 02:20:20 +0400 |
| commit | e71652cf0aa5b8c3807e3ac9327272b98f6b7ef3 (patch) | |
| tree | a4ba0e1e794e804a51f2a79e0cea7b1466798df3 /src/filters/transform/MPCVideoDec/ffmpeg/libavcodec/vp8data.h | |
| parent | b91c1af76073fe2d902550b5f21374cb06f57979 (diff) | |
updated ffmpeg
git-svn-id: https://mpc-hc.svn.sourceforge.net/svnroot/mpc-hc/trunk@2089 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 | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/src/filters/transform/MPCVideoDec/ffmpeg/libavcodec/vp8data.h b/src/filters/transform/MPCVideoDec/ffmpeg/libavcodec/vp8data.h index 60837cfe4..110061f0e 100644 --- a/src/filters/transform/MPCVideoDec/ffmpeg/libavcodec/vp8data.h +++ b/src/filters/transform/MPCVideoDec/ffmpeg/libavcodec/vp8data.h @@ -67,6 +67,7 @@ enum inter_splitmvmode { VP8_SPLITMVMODE_8x16, ///< 2 8x16 blocks (horizontal) VP8_SPLITMVMODE_8x8, ///< 2x2 blocks of 8x8px each VP8_SPLITMVMODE_4x4, ///< 4x4 blocks of 4x4px each + VP8_SPLITMVMODE_NONE, ///< (only used in prediction) no split MVs }; static const uint8_t vp8_pred4x4_mode[] = @@ -118,7 +119,7 @@ static const int8_t vp8_small_mvtree[7][2] = { { -6, -7 } // '110', '111' }; -static const uint8_t vp8_mbsplits[4][16] = { +static const uint8_t vp8_mbsplits[5][16] = { { 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 1, 1, 1, 1, 1, 1 }, { 0, 0, 1, 1, 0, 0, 1, 1, @@ -126,7 +127,9 @@ static const uint8_t vp8_mbsplits[4][16] = { { 0, 0, 1, 1, 0, 0, 1, 1, 2, 2, 3, 3, 2, 2, 3, 3 }, { 0, 1, 2, 3, 4, 5, 6, 7, - 8, 9, 10, 11, 12, 13, 14, 15 } + 8, 9, 10, 11, 12, 13, 14, 15 }, + { 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0 } }; static const uint8_t vp8_mbfirstidx[4][16] = { |