diff --git a/libeplayer3/external/flv2mpeg4/src/flv.h b/libeplayer3/external/flv2mpeg4/src/flv.h index 22874b3..573ceb5 100644 --- a/libeplayer3/external/flv2mpeg4/src/flv.h +++ b/libeplayer3/external/flv2mpeg4/src/flv.h @@ -87,7 +87,6 @@ void encode_I_mb(BW *bw, MICROBLOCK *mb, int escape_type); void encode_P_mb(BW *bw, MICROBLOCK *mb, int escape_type); ////////////////////////////////////////////////////////////////////////////////////////////////////////////////// - static const uint16 rl_inter_vlc[103][2] = { { 0x2, 2 }, { 0xf, 4 }, { 0x15, 6 }, { 0x17, 7 }, @@ -115,7 +114,7 @@ static const uint16 rl_inter_vlc[103][2] = { 0x5, 10 }, { 0x4, 10 }, { 0x24, 11 }, { 0x25, 11 }, { 0x26, 11 }, { 0x27, 11 }, { 0x58, 12 }, { 0x59, 12 }, { 0x5a, 12 }, { 0x5b, 12 }, { 0x5c, 12 }, { 0x5d, 12 }, - { 0x5e, 12 }, { 0x5f, 12 }, { 0x3, 7 }, + { 0x5e, 12 }, { 0x5f, 12 }, { 0x3, 7 } }; static const int8 rl_inter_level[102] = @@ -132,7 +131,7 @@ static const int8 rl_inter_level[102] = 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, - 1, 1, 1, 1, 1, 1, + 1, 1, 1, 1, 1, 1 }; static const int8 rl_inter_run[102] = @@ -149,7 +148,7 @@ static const int8 rl_inter_run[102] = 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31, 32, 33, 34, - 35, 36, 37, 38, 39, 40, + 35, 36, 37, 38, 39, 40 }; ////////////////////////////////////////////////////////////////////////////////////////////////////////////////// diff --git a/libeplayer3/external/flv2mpeg4/src/flvdecoder.c b/libeplayer3/external/flv2mpeg4/src/flvdecoder.c index 2a3cb9b..540c897 100644 --- a/libeplayer3/external/flv2mpeg4/src/flvdecoder.c +++ b/libeplayer3/external/flv2mpeg4/src/flvdecoder.c @@ -66,7 +66,7 @@ static const VLCtab vlc_table_inter_MCBPC[] = //table_size=198 table_allocated=2 {20, 2}, {15, 2}, {15, 2}, {15, 2}, {15, 2}, {15, 2}, {15, 2}, {15, 2}, {15, 2}, {15, 2}, {15, 2}, {15, 2}, {15, 2}, {15, 2}, {15, 2}, {15, 2}, {15, 2}, {14, 2}, {14, 2}, {14, 2}, {14, 2}, {14, 2}, {14, 2}, {14, 2}, {14, 2}, {14, 2}, {14, 2}, {14, 2}, {14, 2}, {14, 2}, {14, 2}, {14, 2}, {14, 2}, {13, 2}, {11, 2}, {6, 1}, - {6, 1}, {5, 1}, {19, 1}, + {6, 1}, {5, 1}, {19, 1} }; static const VLCtab vlc_table_cbpy[] = //table_size=64 table_allocated=64 bits=6 @@ -167,7 +167,7 @@ static const VLCtab vlc_table_mv[] = //mv_vlc: table_size=538 table_allocated=10 {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}, {0, 1}, {0, 1}, {0, 1}, {0, 1}, {0, 1}, {0, 1}, {0, 1}, {0, 1}, {0, 1}, {0, 1}, {-1, 0}, {-1, 0}, {32, 3}, {31, 3}, {30, 2}, {30, 2}, {29, 2}, {29, 2}, {28, 2}, {27, 2}, {26, 2}, {25, 2}, {24, 1}, {23, 1}, {22, 1}, - {21, 1}, {20, 1}, {19, 1}, {18, 1}, {17, 1}, {16, 1}, {15, 1}, {14, 1}, {13, 1}, {12, 1}, {11, 1}, + {21, 1}, {20, 1}, {19, 1}, {18, 1}, {17, 1}, {16, 1}, {15, 1}, {14, 1}, {13, 1}, {12, 1}, {11, 1} }; //////////////////////////////////////////////////////////////////////////////////////////////////////////////////