diff options
Diffstat (limited to 'src/libffmpeg/libavcodec/sp5x.h')
| -rw-r--r-- | src/libffmpeg/libavcodec/sp5x.h | 38 |
1 files changed, 19 insertions, 19 deletions
diff --git a/src/libffmpeg/libavcodec/sp5x.h b/src/libffmpeg/libavcodec/sp5x.h index dee3591bc..72ae1cab1 100644 --- a/src/libffmpeg/libavcodec/sp5x.h +++ b/src/libffmpeg/libavcodec/sp5x.h @@ -14,7 +14,7 @@ * * You should have received a copy of the GNU Lesser General Public * License along with this library; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ #ifndef SP5X_H @@ -22,12 +22,12 @@ static const uint8_t sp5x_data_sof[] = { - 0xFF, 0xC0, /* SOF */ - 0x00, 0x11, /* len */ - 0x08, /* bits */ - 0x00, 0xf0, /* height (default: 240) */ - 0x01, 0x40, /* width (default: 240) */ - 0x03, /* nb components */ + 0xFF, 0xC0, /* SOF */ + 0x00, 0x11, /* len */ + 0x08, /* bits */ + 0x00, 0xf0, /* height (default: 240) */ + 0x01, 0x40, /* width (default: 240) */ + 0x03, /* nb components */ 0x01, 0x22, 0x00, /* 21 vs 22 ? */ 0x02, 0x11, 0x01, 0x03, 0x11, 0x01 @@ -35,15 +35,15 @@ static const uint8_t sp5x_data_sof[] = static const uint8_t sp5x_data_sos[] = { - 0xFF, 0xDA, /* SOS */ - 0x00, 0x0C, /* len */ - 0x03, /* nb components */ + 0xFF, 0xDA, /* SOS */ + 0x00, 0x0C, /* len */ + 0x03, /* nb components */ 0x01, 0x00, 0x02, 0x11, 0x03, 0x11, - 0x00, /* Ss */ - 0x3F, /* Se */ - 0x00 /* Ah/Al */ + 0x00, /* Ss */ + 0x3F, /* Se */ + 0x00 /* Ah/Al */ }; static const uint8_t sp5x_data_dqt[] = @@ -70,9 +70,9 @@ static const uint8_t sp5x_data_dqt[] = 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22 }; -static const uint8_t sp5x_data_dht[] = { - 0xFF, 0xC4, /* DHT */ - 0x01, 0xA2, /* len */ +static const uint8_t sp5x_data_dht[] = { + 0xFF, 0xC4, /* DHT */ + 0x01, 0xA2, /* len */ 0x00, 0x00, 0x01, 0x05, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, @@ -233,7 +233,7 @@ static const uint8_t sp5x_quant_table[20][64]= #if 0 /* 4NF-M, not ZigZag */ -static const uint8_t sp5x_quant_table_orig[18][64] = +static const uint8_t sp5x_quant_table_orig[18][64] = { /* index 0, Q50 */ { 16, 11, 10, 16, 24, 40, 51, 61, 12, 12, 14, 19, 26, 58, 60, 55, @@ -257,7 +257,7 @@ static const uint8_t sp5x_quant_table_orig[18][64] = /* index 2, Q80 */ { 6, 4, 4, 6, 10, 16, 20, 24, 5, 5, 6, 8, 10, 23, 24, 22, - 6, 5, 6, 10, 16, 23, 28, 22, 6, 7, 9, 12, 20, 35, 32, 25, + 6, 5, 6, 10, 16, 23, 28, 22, 6, 7, 9, 12, 20, 35, 32, 25, 7, 9, 15, 22, 27, 44, 41, 31, 10, 14, 22, 26, 32, 42, 45, 37, 20, 26, 31, 35, 41, 48, 48, 40, 29, 37, 38, 39, 45, 40, 41, 40 }, { 7, 7, 10, 19, 40, 40, 40, 40, 7, 8, 10, 26, 40, 40, 40, 40, @@ -267,7 +267,7 @@ static const uint8_t sp5x_quant_table_orig[18][64] = /* index 3, Q85 */ { 5, 3, 3, 5, 7, 12, 15, 18, 4, 4, 4, 6, 8, 17, 18, 17, - 4, 4, 5, 7, 12, 17, 21, 17, 4, 5, 7, 9, 15, 26, 24, 19, + 4, 4, 5, 7, 12, 17, 21, 17, 4, 5, 7, 9, 15, 26, 24, 19, 5, 7, 11, 17, 20, 33, 31, 23, 7, 11, 17, 19, 24, 31, 34, 28, 15, 19, 23, 26, 31, 36, 36, 30, 22, 28, 29, 29, 34, 30, 31, 30 }, { 5, 5, 7, 14, 30, 30, 30, 30, 5, 6, 8, 20, 30, 30, 30, 30, |