Bring libmpeg2 portions that we use up to date with the latest libmpeg2 CVS. Fix up some file headers and add a revision history to the libmpeg2 files detailing to which CVS file revisions things were synced. This makes it easier to start in the right place by hand in the future. Hopefully no mistakes and everything works. :-)

git-svn-id: svn://svn.rockbox.org/rockbox/trunk@17904 a1c6a512-1295-4272-9138-f99709370657

1 files changed, 78 insertions, 74 deletions

diff --git a/apps/plugins/mpegplayer/vlc.h b/apps/plugins/mpegplayer/vlc.h
index 90245cc8ea..d1b6a98cde 100644
--- a/apps/plugins/mpegplayer/vlc.h
+++ b/apps/plugins/mpegplayer/vlc.h
@@ -19,6 +19,10 @@
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ *
+ * $Id$
+ * libmpeg2 sync history:
+ * 2008-07-01 - CVS revision 1.12
  */
 
 #define GETWORD(bit_buf, shift, bit_ptr) \
@@ -121,7 +125,7 @@ static const MBtab MB_P [] ICONST_ATTR = {
 #define INTER MACROBLOCK_MOTION_FORWARD|MACROBLOCK_MOTION_BACKWARD
 
 static const MBtab MB_B [] ICONST_ATTR = {
-    {0,                 0}, {INTRA|QUANT,       6},
+    {0,                 6}, {INTRA|QUANT,       6},
     {BWD|CODED|QUANT,   6}, {FWD|CODED|QUANT,   6},
     {INTER|CODED|QUANT, 5}, {INTER|CODED|QUANT, 5},
                     {INTRA,       5}, {INTRA,       5},
@@ -201,7 +205,7 @@ static const CBPtab CBP_7 [] ICONST_ATTR = {
 };
 
 static const CBPtab CBP_9 [] ICONST_ATTR = {
-    {0,    0}, {0x00, 9}, {0x39, 9}, {0x36, 9},
+    {0,    9}, {0x00, 9}, {0x39, 9}, {0x36, 9},
     {0x37, 9}, {0x3b, 9}, {0x3d, 9}, {0x3e, 9},
     {0x17, 8}, {0x17, 8}, {0x1b, 8}, {0x1b, 8},
     {0x1d, 8}, {0x1d, 8}, {0x1e, 8}, {0x1e, 8},
@@ -289,15 +293,15 @@ static const DCTtab DCT_B14_10 [] ICONST_ATTR = {
 };
 
 static const DCTtab DCT_B14_8 [] ICONST_ATTR = {
-    { 65, 0, 6}, { 65, 0, 6}, { 65, 0, 6}, { 65, 0, 6},
-    {  3, 2, 7}, {  3, 2, 7}, { 10, 1, 7}, { 10, 1, 7},
-    {  1, 4, 7}, {  1, 4, 7}, {  9, 1, 7}, {  9, 1, 7},
-    {  8, 1, 6}, {  8, 1, 6}, {  8, 1, 6}, {  8, 1, 6},
-    {  7, 1, 6}, {  7, 1, 6}, {  7, 1, 6}, {  7, 1, 6},
-    {  2, 2, 6}, {  2, 2, 6}, {  2, 2, 6}, {  2, 2, 6},
-    {  6, 1, 6}, {  6, 1, 6}, {  6, 1, 6}, {  6, 1, 6},
-    { 14, 1, 8}, {  1, 6, 8}, { 13, 1, 8}, { 12, 1, 8},
-    {  4, 2, 8}, {  2, 3, 8}, {  1, 5, 8}, { 11, 1, 8}
+    { 65, 0, 12}, { 65, 0, 12}, { 65, 0, 12}, { 65, 0, 12},
+    {  3, 2,  7}, {  3, 2,  7}, { 10, 1,  7}, { 10, 1,  7},
+    {  1, 4,  7}, {  1, 4,  7}, {  9, 1,  7}, {  9, 1,  7},
+    {  8, 1,  6}, {  8, 1,  6}, {  8, 1,  6}, {  8, 1,  6},
+    {  7, 1,  6}, {  7, 1,  6}, {  7, 1,  6}, {  7, 1,  6},
+    {  2, 2,  6}, {  2, 2,  6}, {  2, 2,  6}, {  2, 2,  6},
+    {  6, 1,  6}, {  6, 1,  6}, {  6, 1,  6}, {  6, 1,  6},
+    { 14, 1,  8}, {  1, 6,  8}, { 13, 1,  8}, { 12, 1,  8},
+    {  4, 2,  8}, {  2, 3,  8}, {  1, 5,  8}, { 11, 1,  8}
 };
 
 static const DCTtab DCT_B14AC_5 [] ICONST_ATTR = {
@@ -326,69 +330,69 @@ static const DCTtab DCT_B15_10 [] ICONST_ATTR = {
 };
 
 static const DCTtab DCT_B15_8 [] ICONST_ATTR = {
-    { 65, 0, 6}, { 65, 0, 6}, { 65, 0, 6}, { 65, 0, 6},
-    {  8, 1, 7}, {  8, 1, 7}, {  9, 1, 7}, {  9, 1, 7},
-    {  7, 1, 7}, {  7, 1, 7}, {  3, 2, 7}, {  3, 2, 7},
-    {  1, 7, 6}, {  1, 7, 6}, {  1, 7, 6}, {  1, 7, 6},
-    {  1, 6, 6}, {  1, 6, 6}, {  1, 6, 6}, {  1, 6, 6},
-    {  5, 1, 6}, {  5, 1, 6}, {  5, 1, 6}, {  5, 1, 6},
-    {  6, 1, 6}, {  6, 1, 6}, {  6, 1, 6}, {  6, 1, 6},
-    {  2, 5, 8}, { 12, 1, 8}, {  1,11, 8}, {  1,10, 8},
-    { 14, 1, 8}, { 13, 1, 8}, {  4, 2, 8}, {  2, 4, 8},
-    {  3, 1, 5}, {  3, 1, 5}, {  3, 1, 5}, {  3, 1, 5},
-    {  3, 1, 5}, {  3, 1, 5}, {  3, 1, 5}, {  3, 1, 5},
-    {  2, 2, 5}, {  2, 2, 5}, {  2, 2, 5}, {  2, 2, 5},
-    {  2, 2, 5}, {  2, 2, 5}, {  2, 2, 5}, {  2, 2, 5},
-    {  4, 1, 5}, {  4, 1, 5}, {  4, 1, 5}, {  4, 1, 5},
-    {  4, 1, 5}, {  4, 1, 5}, {  4, 1, 5}, {  4, 1, 5},
-    {  2, 1, 3}, {  2, 1, 3}, {  2, 1, 3}, {  2, 1, 3},
-    {  2, 1, 3}, {  2, 1, 3}, {  2, 1, 3}, {  2, 1, 3},
-    {  2, 1, 3}, {  2, 1, 3}, {  2, 1, 3}, {  2, 1, 3},
-    {  2, 1, 3}, {  2, 1, 3}, {  2, 1, 3}, {  2, 1, 3},
-    {  2, 1, 3}, {  2, 1, 3}, {  2, 1, 3}, {  2, 1, 3},
-    {  2, 1, 3}, {  2, 1, 3}, {  2, 1, 3}, {  2, 1, 3},
-    {  2, 1, 3}, {  2, 1, 3}, {  2, 1, 3}, {  2, 1, 3},
-    {  2, 1, 3}, {  2, 1, 3}, {  2, 1, 3}, {  2, 1, 3},
-    {129, 0, 4}, {129, 0, 4}, {129, 0, 4}, {129, 0, 4},
-    {129, 0, 4}, {129, 0, 4}, {129, 0, 4}, {129, 0, 4},
-    {129, 0, 4}, {129, 0, 4}, {129, 0, 4}, {129, 0, 4},
-    {129, 0, 4}, {129, 0, 4}, {129, 0, 4}, {129, 0, 4},
-    {  1, 3, 4}, {  1, 3, 4}, {  1, 3, 4}, {  1, 3, 4},
-    {  1, 3, 4}, {  1, 3, 4}, {  1, 3, 4}, {  1, 3, 4},
-    {  1, 3, 4}, {  1, 3, 4}, {  1, 3, 4}, {  1, 3, 4},
-    {  1, 3, 4}, {  1, 3, 4}, {  1, 3, 4}, {  1, 3, 4},
-    {  1, 1, 2}, {  1, 1, 2}, {  1, 1, 2}, {  1, 1, 2},
-    {  1, 1, 2}, {  1, 1, 2}, {  1, 1, 2}, {  1, 1, 2},
-    {  1, 1, 2}, {  1, 1, 2}, {  1, 1, 2}, {  1, 1, 2},
-    {  1, 1, 2}, {  1, 1, 2}, {  1, 1, 2}, {  1, 1, 2},
-    {  1, 1, 2}, {  1, 1, 2}, {  1, 1, 2}, {  1, 1, 2},
-    {  1, 1, 2}, {  1, 1, 2}, {  1, 1, 2}, {  1, 1, 2},
-    {  1, 1, 2}, {  1, 1, 2}, {  1, 1, 2}, {  1, 1, 2},
-    {  1, 1, 2}, {  1, 1, 2}, {  1, 1, 2}, {  1, 1, 2},
-    {  1, 1, 2}, {  1, 1, 2}, {  1, 1, 2}, {  1, 1, 2},
-    {  1, 1, 2}, {  1, 1, 2}, {  1, 1, 2}, {  1, 1, 2},
-    {  1, 1, 2}, {  1, 1, 2}, {  1, 1, 2}, {  1, 1, 2},
-    {  1, 1, 2}, {  1, 1, 2}, {  1, 1, 2}, {  1, 1, 2},
-    {  1, 1, 2}, {  1, 1, 2}, {  1, 1, 2}, {  1, 1, 2},
-    {  1, 1, 2}, {  1, 1, 2}, {  1, 1, 2}, {  1, 1, 2},
-    {  1, 1, 2}, {  1, 1, 2}, {  1, 1, 2}, {  1, 1, 2},
-    {  1, 1, 2}, {  1, 1, 2}, {  1, 1, 2}, {  1, 1, 2},
-    {  1, 2, 3}, {  1, 2, 3}, {  1, 2, 3}, {  1, 2, 3},
-    {  1, 2, 3}, {  1, 2, 3}, {  1, 2, 3}, {  1, 2, 3},
-    {  1, 2, 3}, {  1, 2, 3}, {  1, 2, 3}, {  1, 2, 3},
-    {  1, 2, 3}, {  1, 2, 3}, {  1, 2, 3}, {  1, 2, 3},
-    {  1, 2, 3}, {  1, 2, 3}, {  1, 2, 3}, {  1, 2, 3},
-    {  1, 2, 3}, {  1, 2, 3}, {  1, 2, 3}, {  1, 2, 3},
-    {  1, 2, 3}, {  1, 2, 3}, {  1, 2, 3}, {  1, 2, 3},
-    {  1, 2, 3}, {  1, 2, 3}, {  1, 2, 3}, {  1, 2, 3},
-    {  1, 4, 5}, {  1, 4, 5}, {  1, 4, 5}, {  1, 4, 5},
-    {  1, 4, 5}, {  1, 4, 5}, {  1, 4, 5}, {  1, 4, 5},
-    {  1, 5, 5}, {  1, 5, 5}, {  1, 5, 5}, {  1, 5, 5},
-    {  1, 5, 5}, {  1, 5, 5}, {  1, 5, 5}, {  1, 5, 5},
-    { 10, 1, 7}, { 10, 1, 7}, {  2, 3, 7}, {  2, 3, 7},
-    { 11, 1, 7}, { 11, 1, 7}, {  1, 8, 7}, {  1, 8, 7},
-    {  1, 9, 7}, {  1, 9, 7}, {  1,12, 8}, {  1,13, 8},
-    {  3, 3, 8}, {  5, 2, 8}, {  1,14, 8}, {  1,15, 8}
+    { 65, 0, 12}, { 65, 0, 12}, { 65, 0, 12}, { 65, 0, 12},
+    {  8, 1,  7}, {  8, 1,  7}, {  9, 1,  7}, {  9, 1,  7},
+    {  7, 1,  7}, {  7, 1,  7}, {  3, 2,  7}, {  3, 2,  7},
+    {  1, 7,  6}, {  1, 7,  6}, {  1, 7,  6}, {  1, 7,  6},
+    {  1, 6,  6}, {  1, 6,  6}, {  1, 6,  6}, {  1, 6,  6},
+    {  5, 1,  6}, {  5, 1,  6}, {  5, 1,  6}, {  5, 1,  6},
+    {  6, 1,  6}, {  6, 1,  6}, {  6, 1,  6}, {  6, 1,  6},
+    {  2, 5,  8}, { 12, 1,  8}, {  1,11,  8}, {  1,10,  8},
+    { 14, 1,  8}, { 13, 1,  8}, {  4, 2,  8}, {  2, 4,  8},
+    {  3, 1,  5}, {  3, 1,  5}, {  3, 1,  5}, {  3, 1,  5},
+    {  3, 1,  5}, {  3, 1,  5}, {  3, 1,  5}, {  3, 1,  5},
+    {  2, 2,  5}, {  2, 2,  5}, {  2, 2,  5}, {  2, 2,  5},
+    {  2, 2,  5}, {  2, 2,  5}, {  2, 2,  5}, {  2, 2,  5},
+    {  4, 1,  5}, {  4, 1,  5}, {  4, 1,  5}, {  4, 1,  5},
+    {  4, 1,  5}, {  4, 1,  5}, {  4, 1,  5}, {  4, 1,  5},
+    {  2, 1,  3}, {  2, 1,  3}, {  2, 1,  3}, {  2, 1,  3},
+    {  2, 1,  3}, {  2, 1,  3}, {  2, 1,  3}, {  2, 1,  3},
+    {  2, 1,  3}, {  2, 1,  3}, {  2, 1,  3}, {  2, 1,  3},
+    {  2, 1,  3}, {  2, 1,  3}, {  2, 1,  3}, {  2, 1,  3},
+    {  2, 1,  3}, {  2, 1,  3}, {  2, 1,  3}, {  2, 1,  3},
+    {  2, 1,  3}, {  2, 1,  3}, {  2, 1,  3}, {  2, 1,  3},
+    {  2, 1,  3}, {  2, 1,  3}, {  2, 1,  3}, {  2, 1,  3},
+    {  2, 1,  3}, {  2, 1,  3}, {  2, 1,  3}, {  2, 1,  3},
+    {129, 0,  4}, {129, 0,  4}, {129, 0,  4}, {129, 0,  4},
+    {129, 0,  4}, {129, 0,  4}, {129, 0,  4}, {129, 0,  4},
+    {129, 0,  4}, {129, 0,  4}, {129, 0,  4}, {129, 0,  4},
+    {129, 0,  4}, {129, 0,  4}, {129, 0,  4}, {129, 0,  4},
+    {  1, 3,  4}, {  1, 3,  4}, {  1, 3,  4}, {  1, 3,  4},
+    {  1, 3,  4}, {  1, 3,  4}, {  1, 3,  4}, {  1, 3,  4},
+    {  1, 3,  4}, {  1, 3,  4}, {  1, 3,  4}, {  1, 3,  4},
+    {  1, 3,  4}, {  1, 3,  4}, {  1, 3,  4}, {  1, 3,  4},
+    {  1, 1,  2}, {  1, 1,  2}, {  1, 1,  2}, {  1, 1,  2},
+    {  1, 1,  2}, {  1, 1,  2}, {  1, 1,  2}, {  1, 1,  2},
+    {  1, 1,  2}, {  1, 1,  2}, {  1, 1,  2}, {  1, 1,  2},
+    {  1, 1,  2}, {  1, 1,  2}, {  1, 1,  2}, {  1, 1,  2},
+    {  1, 1,  2}, {  1, 1,  2}, {  1, 1,  2}, {  1, 1,  2},
+    {  1, 1,  2}, {  1, 1,  2}, {  1, 1,  2}, {  1, 1,  2},
+    {  1, 1,  2}, {  1, 1,  2}, {  1, 1,  2}, {  1, 1,  2},
+    {  1, 1,  2}, {  1, 1,  2}, {  1, 1,  2}, {  1, 1,  2},
+    {  1, 1,  2}, {  1, 1,  2}, {  1, 1,  2}, {  1, 1,  2},
+    {  1, 1,  2}, {  1, 1,  2}, {  1, 1,  2}, {  1, 1,  2},
+    {  1, 1,  2}, {  1, 1,  2}, {  1, 1,  2}, {  1, 1,  2},
+    {  1, 1,  2}, {  1, 1,  2}, {  1, 1,  2}, {  1, 1,  2},
+    {  1, 1,  2}, {  1, 1,  2}, {  1, 1,  2}, {  1, 1,  2},
+    {  1, 1,  2}, {  1, 1,  2}, {  1, 1,  2}, {  1, 1,  2},
+    {  1, 1,  2}, {  1, 1,  2}, {  1, 1,  2}, {  1, 1,  2},
+    {  1, 1,  2}, {  1, 1,  2}, {  1, 1,  2}, {  1, 1,  2},
+    {  1, 2,  3}, {  1, 2,  3}, {  1, 2,  3}, {  1, 2,  3},
+    {  1, 2,  3}, {  1, 2,  3}, {  1, 2,  3}, {  1, 2,  3},
+    {  1, 2,  3}, {  1, 2,  3}, {  1, 2,  3}, {  1, 2,  3},
+    {  1, 2,  3}, {  1, 2,  3}, {  1, 2,  3}, {  1, 2,  3},
+    {  1, 2,  3}, {  1, 2,  3}, {  1, 2,  3}, {  1, 2,  3},
+    {  1, 2,  3}, {  1, 2,  3}, {  1, 2,  3}, {  1, 2,  3},
+    {  1, 2,  3}, {  1, 2,  3}, {  1, 2,  3}, {  1, 2,  3},
+    {  1, 2,  3}, {  1, 2,  3}, {  1, 2,  3}, {  1, 2,  3},
+    {  1, 4,  5}, {  1, 4,  5}, {  1, 4,  5}, {  1, 4,  5},
+    {  1, 4,  5}, {  1, 4,  5}, {  1, 4,  5}, {  1, 4,  5},
+    {  1, 5,  5}, {  1, 5,  5}, {  1, 5,  5}, {  1, 5,  5},
+    {  1, 5,  5}, {  1, 5,  5}, {  1, 5,  5}, {  1, 5,  5},
+    { 10, 1,  7}, { 10, 1,  7}, {  2, 3,  7}, {  2, 3,  7},
+    { 11, 1,  7}, { 11, 1,  7}, {  1, 8,  7}, {  1, 8,  7},
+    {  1, 9,  7}, {  1, 9,  7}, {  1,12,  8}, {  1,13,  8},
+    {  3, 3,  8}, {  5, 2,  8}, {  1,14,  8}, {  1,15,  8}
 };