From c5b6afab8b74e5cc938b8467d3808a877ded7d03 Mon Sep 17 00:00:00 2001
From: Mike Melanson <mike@multimedia.cx>
Date: Mon, 27 Oct 2003 15:24:38 +0000
Subject: super mega ffmpeg tree sync

CVS patchset: 5615
CVS date: 2003/10/27 15:24:38
---
 src/libffmpeg/libavcodec/mpeg4data.h | 30 +++++++++++++++++-------------
 1 file changed, 17 insertions(+), 13 deletions(-)

(limited to 'src/libffmpeg/libavcodec/mpeg4data.h')

diff --git a/src/libffmpeg/libavcodec/mpeg4data.h b/src/libffmpeg/libavcodec/mpeg4data.h
index bc0d4530e..0092a9f5e 100644
--- a/src/libffmpeg/libavcodec/mpeg4data.h
+++ b/src/libffmpeg/libavcodec/mpeg4data.h
@@ -27,7 +27,7 @@
 #define MOTION_MARKER 0x1F001
 #define DC_MARKER     0x6B001
 
-const static int mb_type_b_map[4]= {
+static const int mb_type_b_map[4]= {
     MB_TYPE_DIRECT2 | MB_TYPE_L0L1,
     MB_TYPE_L0L1 | MB_TYPE_16x16,
     MB_TYPE_L1 | MB_TYPE_16x16,
@@ -341,23 +341,23 @@ static const uint8_t mb_type_b_tab[4][2] = {
  {1, 1}, {1, 2}, {1, 3}, {1, 4},
 };
 
-static const uint16_t pixel_aspect[16][2]={
- {0, 0},
+static const AVRational pixel_aspect[16]={
+ {0, 1},
  {1, 1},
  {12, 11},
  {10, 11},
  {16, 11},
  {40, 33},
- {0, 0},
- {0, 0},
- {0, 0},
- {0, 0},
- {0, 0},
- {0, 0},
- {0, 0},
- {0, 0},
- {0, 0},
- {0, 0},
+ {0, 1},
+ {0, 1},
+ {0, 1},
+ {0, 1},
+ {0, 1},
+ {0, 1},
+ {0, 1},
+ {0, 1},
+ {0, 1},
+ {0, 1},
 };
 
 /* these matrixes will be permuted for the idct */
@@ -395,3 +395,7 @@ uint8_t ff_mpeg4_c_dc_scale_table[32]={
 const uint16_t ff_mpeg4_resync_prefix[8]={
     0x7F00, 0x7E00, 0x7C00, 0x7800, 0x7000, 0x6000, 0x4000, 0x0000
 };
+
+static const uint8_t mpeg4_dc_threshold[8]={
+    99, 13, 15, 17, 19, 21, 23, 0
+};
-- 
cgit v1.2.3