generic-library/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Rename code012() to ff_code012(), and remove static qualifier: paves the way

Browse Source 
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

Originally committed as revision 9222 to svn://svn.ffmpeg.org/ffmpeg/trunk
This commit is contained in:
Denis Fortin 2007-06-05 07:18:29 +00:00 committed by Guillaume Poirier
parent ac3967c1ce
commit f0edfda578
2 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
libavcodec/msmpeg4.c
View File

@ -162,7 +162,7 @@ static void init_mv_table(MVTable *tab)
} }
} }
static void code012(PutBitContext *pb, int n) void ff_code012(PutBitContext *pb, int n)
{ {
if (n == 0) { if (n == 0) {
put_bits(pb, 1, 0); put_bits(pb, 1, 0);
@ -348,8 +348,8 @@ void msmpeg4_encode_picture_header(MpegEncContext * s, int picture_number)
if(s->msmpeg4_version>2){ if(s->msmpeg4_version>2){
if(!s->per_mb_rl_table){ if(!s->per_mb_rl_table){
code012(&s->pb, s->rl_chroma_table_index); ff_code012(&s->pb, s->rl_chroma_table_index);
code012(&s->pb, s->rl_table_index); ff_code012(&s->pb, s->rl_table_index);
} }
put_bits(&s->pb, 1, s->dc_table_index); put_bits(&s->pb, 1, s->dc_table_index);
@ -362,7 +362,7 @@ void msmpeg4_encode_picture_header(MpegEncContext * s, int picture_number)
if(s->msmpeg4_version>2){ if(s->msmpeg4_version>2){
if(!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);
put_bits(&s->pb, 1, s->dc_table_index); put_bits(&s->pb, 1, s->dc_table_index);

10
libavcodec/wmv2.c
View File

@ -144,8 +144,8 @@ int ff_wmv2_encode_picture_header(MpegEncContext * s, int picture_number)
if(w->per_mb_rl_bit) put_bits(&s->pb, 1, s->per_mb_rl_table); if(w->per_mb_rl_bit) put_bits(&s->pb, 1, s->per_mb_rl_table);
if(!s->per_mb_rl_table){ if(!s->per_mb_rl_table){
code012(&s->pb, s->rl_chroma_table_index); ff_code012(&s->pb, s->rl_chroma_table_index);
code012(&s->pb, s->rl_table_index); ff_code012(&s->pb, s->rl_table_index);
} }
put_bits(&s->pb, 1, s->dc_table_index); put_bits(&s->pb, 1, s->dc_table_index);
@ -156,7 +156,7 @@ int ff_wmv2_encode_picture_header(MpegEncContext * s, int picture_number)
put_bits(&s->pb, 2, SKIP_TYPE_NONE); 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){ if(s->qscale <= 10){
int map[3]= {0,2,1}; int map[3]= {0,2,1};
w->cbp_table_index= map[cbp_index]; w->cbp_table_index= map[cbp_index];
@ -173,14 +173,14 @@ int ff_wmv2_encode_picture_header(MpegEncContext * s, int picture_number)
if(w->abt_flag){ if(w->abt_flag){
put_bits(&s->pb, 1, w->per_mb_abt^1); put_bits(&s->pb, 1, w->per_mb_abt^1);
if(!w->per_mb_abt){ 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(w->per_mb_rl_bit) put_bits(&s->pb, 1, s->per_mb_rl_table);
if(!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; s->rl_chroma_table_index = s->rl_table_index;
} }
put_bits(&s->pb, 1, s->dc_table_index); put_bits(&s->pb, 1, s->dc_table_index);