Mercurial > libavcodec.hg
comparison msmpeg4.c @ 5129:0244bba24b43 libavcodec
misc typo fixes
author | diego |
---|---|
date | Tue, 12 Jun 2007 18:50:50 +0000 |
parents | 4dbe6578f811 |
children | b215d5a5fa9a |
comparison
equal
deleted
inserted
replaced
5128:d98460d07146 | 5129:0244bba24b43 |
---|---|
86 #endif | 86 #endif |
87 | 87 |
88 #include "msmpeg4data.h" | 88 #include "msmpeg4data.h" |
89 #include "msmpeg4tab.h" | 89 #include "msmpeg4tab.h" |
90 | 90 |
91 #ifdef CONFIG_ENCODERS //strangely gcc includes this even if its not references | 91 #ifdef CONFIG_ENCODERS //strangely gcc includes this even if it is not references |
92 static uint8_t rl_length[NB_RL_TABLES][MAX_LEVEL+1][MAX_RUN+1][2]; | 92 static uint8_t rl_length[NB_RL_TABLES][MAX_LEVEL+1][MAX_RUN+1][2]; |
93 #endif //CONFIG_ENCODERS | 93 #endif //CONFIG_ENCODERS |
94 | 94 |
95 static uint8_t static_rl_table_store[NB_RL_TABLES][2][2*MAX_RUN + MAX_LEVEL + 3]; | 95 static uint8_t static_rl_table_store[NB_RL_TABLES][2][2*MAX_RUN + MAX_LEVEL + 3]; |
96 | 96 |
452 code = mv->table_mv_index[(mx << 6) | my]; | 452 code = mv->table_mv_index[(mx << 6) | my]; |
453 put_bits(&s->pb, | 453 put_bits(&s->pb, |
454 mv->table_mv_bits[code], | 454 mv->table_mv_bits[code], |
455 mv->table_mv_code[code]); | 455 mv->table_mv_code[code]); |
456 if (code == mv->n) { | 456 if (code == mv->n) { |
457 /* escape : code litterally */ | 457 /* escape : code literally */ |
458 put_bits(&s->pb, 6, mx); | 458 put_bits(&s->pb, 6, mx); |
459 put_bits(&s->pb, 6, my); | 459 put_bits(&s->pb, 6, my); |
460 } | 460 } |
461 } | 461 } |
462 | 462 |
981 static VLC v2_mv_vlc; | 981 static VLC v2_mv_vlc; |
982 static VLC v1_intra_cbpc_vlc; | 982 static VLC v1_intra_cbpc_vlc; |
983 static VLC v1_inter_cbpc_vlc; | 983 static VLC v1_inter_cbpc_vlc; |
984 static VLC inter_intra_vlc; | 984 static VLC inter_intra_vlc; |
985 | 985 |
986 /* this table is practically identical to the one from h263 except that its inverted */ | 986 /* This table is practically identical to the one from h263 |
987 * except that it is inverted. */ | |
987 static void init_h263_dc_for_msmpeg4(void) | 988 static void init_h263_dc_for_msmpeg4(void) |
988 { | 989 { |
989 int level, uni_code, uni_len; | 990 int level, uni_code, uni_len; |
990 | 991 |
991 for(level=-256; level<256; level++){ | 992 for(level=-256; level<256; level++){ |
1378 } | 1379 } |
1379 } | 1380 } |
1380 } | 1381 } |
1381 #endif | 1382 #endif |
1382 | 1383 |
1383 /* this is identical to h263 except that its range is multiplied by 2 */ | 1384 /* This is identical to h263 except that its range is multiplied by 2. */ |
1384 static int msmpeg4v2_decode_motion(MpegEncContext * s, int pred, int f_code) | 1385 static int msmpeg4v2_decode_motion(MpegEncContext * s, int pred, int f_code) |
1385 { | 1386 { |
1386 int code, val, sign, shift; | 1387 int code, val, sign, shift; |
1387 | 1388 |
1388 code = get_vlc2(&s->gb, v2_mv_vlc.table, V2_MV_VLC_BITS, 2); | 1389 code = get_vlc2(&s->gb, v2_mv_vlc.table, V2_MV_VLC_BITS, 2); |