Mercurial > libavcodec.hg
changeset 5098:997c368e6433 libavcodec
Rename code012() to ff_code012(), and remove static qualifier: paves the way
to vc1 encoder, as this function would be useful there.
patch by Denis Fortin % fortin A nerim P net %
Original thread:
date: Jun 4, 2007 9:23 PM
subject: Re: [FFmpeg-devel] [RFC] move wmv2.c to its own file
| author | gpoirier |
|---|---|
| date | Tue, 05 Jun 2007 07:18:29 +0000 |
| parents | e9a0c447dc73 |
| children | 133329117637 |
| files | msmpeg4.c wmv2.c |
| diffstat | 2 files changed, 9 insertions(+), 9 deletions(-) [+] |
line wrap: on
line diff
--- a/msmpeg4.c Mon Jun 04 23:07:27 2007 +0000 +++ b/msmpeg4.c Tue Jun 05 07:18:29 2007 +0000 @@ -162,7 +162,7 @@ } } -static void code012(PutBitContext *pb, int n) +void ff_code012(PutBitContext *pb, int n) { if (n == 0) { put_bits(pb, 1, 0); @@ -348,8 +348,8 @@ if(s->msmpeg4_version>2){ if(!s->per_mb_rl_table){ - code012(&s->pb, s->rl_chroma_table_index); - code012(&s->pb, s->rl_table_index); + ff_code012(&s->pb, s->rl_chroma_table_index); + ff_code012(&s->pb, s->rl_table_index); } put_bits(&s->pb, 1, s->dc_table_index); @@ -362,7 +362,7 @@ if(s->msmpeg4_version>2){ if(!s->per_mb_rl_table) - code012(&s->pb, s->rl_table_index); + ff_code012(&s->pb, s->rl_table_index); put_bits(&s->pb, 1, s->dc_table_index);
--- a/wmv2.c Mon Jun 04 23:07:27 2007 +0000 +++ b/wmv2.c Tue Jun 05 07:18:29 2007 +0000 @@ -144,8 +144,8 @@ if(w->per_mb_rl_bit) put_bits(&s->pb, 1, s->per_mb_rl_table); if(!s->per_mb_rl_table){ - code012(&s->pb, s->rl_chroma_table_index); - code012(&s->pb, s->rl_table_index); + ff_code012(&s->pb, s->rl_chroma_table_index); + ff_code012(&s->pb, s->rl_table_index); } put_bits(&s->pb, 1, s->dc_table_index); @@ -156,7 +156,7 @@ put_bits(&s->pb, 2, SKIP_TYPE_NONE); - code012(&s->pb, cbp_index=0); + ff_code012(&s->pb, cbp_index=0); if(s->qscale <= 10){ int map[3]= {0,2,1}; w->cbp_table_index= map[cbp_index]; @@ -173,14 +173,14 @@ if(w->abt_flag){ put_bits(&s->pb, 1, w->per_mb_abt^1); if(!w->per_mb_abt){ - code012(&s->pb, w->abt_type); + ff_code012(&s->pb, w->abt_type); } } if(w->per_mb_rl_bit) put_bits(&s->pb, 1, s->per_mb_rl_table); if(!s->per_mb_rl_table){ - code012(&s->pb, s->rl_table_index); + ff_code012(&s->pb, s->rl_table_index); s->rl_chroma_table_index = s->rl_table_index; } put_bits(&s->pb, 1, s->dc_table_index);