Mercurial > libavcodec.hg
diff h263.h @ 10818:514dc1c87b2e libavcodec
Rename most non static h263 tables so their name contains h263.
| author | michael |
|---|---|
| date | Fri, 08 Jan 2010 17:51:48 +0000 |
| parents | 4605bd2fdb7f |
| children | d0657e337f91 |
line wrap: on
line diff
--- a/h263.h Fri Jan 08 17:41:14 2010 +0000 +++ b/h263.h Fri Jan 08 17:51:48 2010 +0000 @@ -30,21 +30,21 @@ #define TEX_VLC_BITS 9 extern const AVRational ff_h263_pixel_aspect[16]; -extern const uint8_t cbpy_tab[16][2]; +extern const uint8_t ff_h263_cbpy_tab[16][2]; extern const uint8_t mvtab[33][2]; -extern const uint8_t intra_MCBPC_code[9]; -extern const uint8_t intra_MCBPC_bits[9]; +extern const uint8_t ff_h263_intra_MCBPC_code[9]; +extern const uint8_t ff_h263_intra_MCBPC_bits[9]; -extern const uint8_t inter_MCBPC_code[28]; -extern const uint8_t inter_MCBPC_bits[28]; +extern const uint8_t ff_h263_inter_MCBPC_code[28]; +extern const uint8_t ff_h263_inter_MCBPC_bits[28]; -extern VLC intra_MCBPC_vlc; -extern VLC inter_MCBPC_vlc; -extern VLC cbpy_vlc; +extern VLC ff_h263_intra_MCBPC_vlc; +extern VLC ff_h263_inter_MCBPC_vlc; +extern VLC ff_h263_cbpy_vlc; -extern RLTable rl_inter; +extern RLTable ff_h263_rl_inter; int h263_decode_motion(MpegEncContext * s, int pred, int f_code); av_const int ff_h263_aspect_to_info(AVRational aspect); @@ -90,7 +90,7 @@ const int lambda= s->lambda2 >> (FF_LAMBDA_SHIFT - 6); for(i=0; i<4; i++){ - int score= inter_MCBPC_bits[i + offset] * lambda; + int score= ff_h263_inter_MCBPC_bits[i + offset] * lambda; if(i&1) score += s->coded_score[5]; if(i&2) score += s->coded_score[4]; @@ -101,7 +101,7 @@ } for(i=0; i<16; i++){ - int score= cbpy_tab[i ^ 0xF][1] * lambda; + int score= ff_h263_cbpy_tab[i ^ 0xF][1] * lambda; if(i&1) score += s->coded_score[3]; if(i&2) score += s->coded_score[2]; if(i&4) score += s->coded_score[1];
