summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDenis Fortin <fortin@nerim.net>2007-06-05 07:18:29 +0000
committerGuillaume Poirier <gpoirier@mplayerhq.hu>2007-06-05 07:18:29 +0000
commitf0edfda5782158d0485c68200ce0d41d06c93027 (patch)
tree323965af240b9148138716ed06dbaa5570bc93ef
parentac3967c1ce6726c65747b83a8198b3416e85deda (diff)
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 Originally committed as revision 9222 to svn://svn.ffmpeg.org/ffmpeg/trunk
-rw-r--r--libavcodec/msmpeg4.c8
-rw-r--r--libavcodec/wmv2.c10
2 files changed, 9 insertions, 9 deletions
diff --git a/libavcodec/msmpeg4.c b/libavcodec/msmpeg4.c
index d98ad03772..35d1330c90 100644
--- a/libavcodec/msmpeg4.c
+++ b/libavcodec/msmpeg4.c
@@ -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) {
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->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 @@ void msmpeg4_encode_picture_header(MpegEncContext * s, int picture_number)
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);
diff --git a/libavcodec/wmv2.c b/libavcodec/wmv2.c
index 255a37a26d..f2f055c9f3 100644
--- a/libavcodec/wmv2.c
+++ b/libavcodec/wmv2.c
@@ -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(!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 @@ int ff_wmv2_encode_picture_header(MpegEncContext * s, int picture_number)
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 @@ int ff_wmv2_encode_picture_header(MpegEncContext * s, int picture_number)
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);