Move last.fm password from PasswordShowOnEdit to Password.

[vlc] / modules / stream_out / transrate / getvlc.h

diff --git a/modules/stream_out/transrate/getvlc.h b/modules/stream_out/transrate/getvlc.h
index bcf82c00dfa7c78234a87727b2a18c631d4a1ab9..3ac8416a1fcdb5f2f53d49c8f4268dbe1ebc1ff2 100644 (file)
--- a/modules/stream_out/transrate/getvlc.h
+++ b/modules/stream_out/transrate/getvlc.h
@@ -20,15 +20,11 @@
 #define BOTTOM_FIELD 2
 #define FRAME_PICTURE 3
 
-/* remove num valid bits from bit_buf */
-#define DUMPBITS(bit_buf,bits,num) Flush_Bits(num)
-#define COPYBITS(bit_buf,bits,num) Copy_Bits(num)
-
 /* take num bits from the high part of bit_buf and zero extend them */
-#define UBITS(bit_buf,num) (((uint32_t)(inbitbuf)) >> (32 - (num)))
+#define UBITS(bit_buf,num) (((uint32_t)(bs->i_bit_in_cache)) >> (32 - (num)))
 
 /* take num bits from the high part of bit_buf and sign extend them */
-#define SBITS(bit_buf,num) (((int32_t)(inbitbuf)) >> (32 - (num)))
+#define SBITS(bit_buf,num) (((int32_t)(bs->i_bit_in_cache)) >> (32 - (num)))
 
 typedef struct {
     uint8_t modes;
@@ -96,7 +92,7 @@ static const MBtab MB_B [] = {
     {0,                 0}, {INTRA|QUANT,       6},
     {BWD|CODED|QUANT,   6}, {FWD|CODED|QUANT,   6},
     {INTER|CODED|QUANT, 5}, {INTER|CODED|QUANT, 5},
-                                       {INTRA,       5}, {INTRA,       5},
+                                        {INTRA,       5}, {INTRA,       5},
     {FWD,         4}, {FWD,         4}, {FWD,         4}, {FWD,         4},
     {FWD|CODED,   4}, {FWD|CODED,   4}, {FWD|CODED,   4}, {FWD|CODED,   4},
     {BWD,         3}, {BWD,         3}, {BWD,         3}, {BWD,         3},
@@ -273,7 +269,7 @@ static const DCTtab DCT_B14_8 [] = {
 };
 
 static const DCTtab DCT_B14AC_5 [] = {
-                {  1, 3, 5}, {  5, 1, 5}, {  4, 1, 5},
+                 {  1, 3, 5}, {  5, 1, 5}, {  4, 1, 5},
     {  1, 2, 4}, {  1, 2, 4}, {  3, 1, 4}, {  3, 1, 4},
     {  2, 1, 3}, {  2, 1, 3}, {  2, 1, 3}, {  2, 1, 3},
     {129, 0, 2}, {129, 0, 2}, {129, 0, 2}, {129, 0, 2},
@@ -283,7 +279,7 @@ static const DCTtab DCT_B14AC_5 [] = {
 };
 
 static const DCTtab DCT_B14DC_5 [] = {
-                {  1, 3, 5}, {  5, 1, 5}, {  4, 1, 5},
+                 {  1, 3, 5}, {  5, 1, 5}, {  4, 1, 5},
     {  1, 2, 4}, {  1, 2, 4}, {  3, 1, 4}, {  3, 1, 4},
     {  2, 1, 3}, {  2, 1, 3}, {  2, 1, 3}, {  2, 1, 3},
     {  1, 1, 1}, {  1, 1, 1}, {  1, 1, 1}, {  1, 1, 1},
@@ -365,7 +361,7 @@ static const DCTtab DCT_B15_8 [] = {
 
 
 static const MBAtab MBA_5 [] = {
-                   {6, 5}, {5, 5}, {4, 4}, {4, 4}, {3, 4}, {3, 4},
+                    {6, 5}, {5, 5}, {4, 4}, {4, 4}, {3, 4}, {3, 4},
     {2, 3}, {2, 3}, {2, 3}, {2, 3}, {1, 3}, {1, 3}, {1, 3}, {1, 3},
     {0, 1}, {0, 1}, {0, 1}, {0, 1}, {0, 1}, {0, 1}, {0, 1}, {0, 1},
     {0, 1}, {0, 1}, {0, 1}, {0, 1}, {0, 1}, {0, 1}, {0, 1}, {0, 1}
@@ -399,3 +395,4 @@ static const MBAtab MBA_11 [] = {
     { 7,  7}, { 7,  7}, { 7,  7}, { 7,  7},
     { 7,  7}, { 7,  7}, { 7,  7}, { 7,  7}
 };
+