summaryrefslogtreecommitdiff
path: root/src/libffmpeg/libavcodec/mpeg12data.h
diff options
context:
space:
mode:
authorGuenter Bartsch <guenter@users.sourceforge.net>2001-08-07 23:59:50 +0000
committerGuenter Bartsch <guenter@users.sourceforge.net>2001-08-07 23:59:50 +0000
commit4c0836e8f1504db9bbb329a1351050a8ff2cf469 (patch)
tree5a15df1f39b66be829da3641336d0cac1b846e34 /src/libffmpeg/libavcodec/mpeg12data.h
parent116de8566118cae73b42132985c174c372ed6c41 (diff)
downloadxine-lib-4c0836e8f1504db9bbb329a1351050a8ff2cf469.tar.gz
xine-lib-4c0836e8f1504db9bbb329a1351050a8ff2cf469.tar.bz2
latest ffmpeg updates - mmx works\! :-)
CVS patchset: 400 CVS date: 2001/08/07 23:59:50
Diffstat (limited to 'src/libffmpeg/libavcodec/mpeg12data.h')
-rw-r--r--src/libffmpeg/libavcodec/mpeg12data.h16
1 files changed, 2 insertions, 14 deletions
diff --git a/src/libffmpeg/libavcodec/mpeg12data.h b/src/libffmpeg/libavcodec/mpeg12data.h
index f397c4a17..4f6a95b79 100644
--- a/src/libffmpeg/libavcodec/mpeg12data.h
+++ b/src/libffmpeg/libavcodec/mpeg12data.h
@@ -2,7 +2,7 @@
* MPEG1/2 tables
*/
-const UINT8 default_intra_matrix[64] = {
+INT16 default_intra_matrix[64] = {
8, 16, 19, 22, 26, 27, 29, 34,
16, 16, 22, 24, 27, 29, 34, 37,
19, 22, 26, 27, 29, 34, 34, 38,
@@ -13,7 +13,7 @@ const UINT8 default_intra_matrix[64] = {
27, 29, 35, 38, 46, 56, 69, 83
};
-const UINT8 default_non_intra_matrix[64] = {
+INT16 default_non_intra_matrix[64] = {
16, 16, 16, 16, 16, 16, 16, 16,
16, 16, 16, 16, 16, 16, 16, 16,
16, 16, 16, 16, 16, 16, 16, 16,
@@ -331,18 +331,6 @@ static const UINT8 mbMotionVectorTable[17][2] = {
{ 0xc, 10 },
};
-//const
-UINT8 zigzag_direct[64] = {
- 0, 1, 8, 16, 9, 2, 3, 10,
- 17, 24, 32, 25, 18, 11, 4, 5,
- 12, 19, 26, 33, 40, 48, 41, 34,
- 27, 20, 13, 6, 7, 14, 21, 28,
- 35, 42, 49, 56, 57, 50, 43, 36,
- 29, 22, 15, 23, 30, 37, 44, 51,
- 58, 59, 52, 45, 38, 31, 39, 46,
- 53, 60, 61, 54, 47, 55, 62, 63
-};
-
static const int frame_rate_tab[9] = {
0,
(int)(23.976 * FRAME_RATE_BASE),