# HG changeset patch
# User iive
# Date 1234635941 0
# Node ID 6ce8ebfc9d862626d877fe9af3d5d33c40f9cee4
# Parent  897a2b1f883ecf3127037e5e0b6967186cf4af48
use ff_xvmc for function names instead of XVMC_

diff -r 897a2b1f883e -r 6ce8ebfc9d86 mpeg12.c
--- a/mpeg12.c	Sat Feb 14 18:15:59 2009 +0000
+++ b/mpeg12.c	Sat Feb 14 18:25:41 2009 +0000
@@ -61,10 +61,10 @@
 static int mpeg_decode_motion(MpegEncContext *s, int fcode, int pred);
 static void exchange_uv(MpegEncContext *s);
 
-int XVMC_field_start(MpegEncContext *s, AVCodecContext *avctx);
-int XVMC_field_end(MpegEncContext *s);
-void XVMC_pack_pblocks(MpegEncContext *s,int cbp);
-void XVMC_init_block(MpegEncContext *s);//set s->block
+int  ff_xvmc_field_start(MpegEncContext *s, AVCodecContext *avctx);
+int  ff_xvmc_field_end(MpegEncContext *s);
+void ff_xvmc_pack_pblocks(MpegEncContext *s,int cbp);
+void ff_xvmc_init_block(MpegEncContext *s);//set s->block
 
 static const enum PixelFormat pixfmt_xvmc_mpg2_420[] = {
                                            PIX_FMT_XVMC_MPEG2_IDCT,
@@ -304,7 +304,7 @@
 #if CONFIG_MPEG_XVMC_DECODER
         //if 1, we memcpy blocks in xvmcvideo
         if(s->avctx->xvmc_acceleration > 1){
-            XVMC_pack_pblocks(s,-1);//inter are always full blocks
+            ff_xvmc_pack_pblocks(s,-1);//inter are always full blocks
             if(s->swap_uv){
                 exchange_uv(s);
             }
@@ -517,7 +517,7 @@
 #if CONFIG_MPEG_XVMC_DECODER
             //if 1, we memcpy blocks in xvmcvideo
             if(s->avctx->xvmc_acceleration > 1){
-                XVMC_pack_pblocks(s,cbp);
+                ff_xvmc_pack_pblocks(s,cbp);
                 if(s->swap_uv){
                     exchange_uv(s);
                 }
@@ -1652,7 +1652,7 @@
 // MPV_frame_start will call this function too,
 // but we need to call it on every field
     if(s->avctx->xvmc_acceleration)
-         XVMC_field_start(s,avctx);
+         ff_xvmc_field_start(s,avctx);
 #endif
 
     return 0;
@@ -1742,7 +1742,7 @@
 #if CONFIG_MPEG_XVMC_DECODER
         //If 1, we memcpy blocks in xvmcvideo.
         if(s->avctx->xvmc_acceleration > 1)
-            XVMC_init_block(s);//set s->block
+            ff_xvmc_init_block(s);//set s->block
 #endif
 
         if(mpeg_decode_mb(s, s->block) < 0)
@@ -1923,7 +1923,7 @@
 
 #if CONFIG_MPEG_XVMC_DECODER
     if(s->avctx->xvmc_acceleration)
-        XVMC_field_end(s);
+        ff_xvmc_field_end(s);
 #endif
     /* end of slice reached */
     if (/*s->mb_y<<field_pic == s->mb_height &&*/ !s->first_field) {
diff -r 897a2b1f883e -r 6ce8ebfc9d86 mpegvideo.c
--- a/mpegvideo.c	Sat Feb 14 18:15:59 2009 +0000
+++ b/mpegvideo.c	Sat Feb 14 18:25:41 2009 +0000
@@ -56,7 +56,7 @@
 
 int  XVMC_field_start(MpegEncContext*s, AVCodecContext *avctx);
 void XVMC_field_end(MpegEncContext *s);
-void XVMC_decode_mb(MpegEncContext *s);
+void ff_xvmc_decode_mb(MpegEncContext *s);
 
 
 /* enable all paranoid tests for rounding, overflows, etc... */
@@ -1738,7 +1738,7 @@
     const int mb_xy = s->mb_y * s->mb_stride + s->mb_x;
 #if CONFIG_MPEG_XVMC_DECODER
     if(s->avctx->xvmc_acceleration){
-        XVMC_decode_mb(s);//xvmc uses pblocks
+        ff_xvmc_decode_mb(s);//xvmc uses pblocks
         return;
     }
 #endif
diff -r 897a2b1f883e -r 6ce8ebfc9d86 mpegvideo_xvmc.c
--- a/mpegvideo_xvmc.c	Sat Feb 14 18:15:59 2009 +0000
+++ b/mpegvideo_xvmc.c	Sat Feb 14 18:25:41 2009 +0000
@@ -36,7 +36,7 @@
 #include "xvmc.h"
 
 //set s->block
-void XVMC_init_block(MpegEncContext *s)
+void ff_xvmc_init_block(MpegEncContext *s)
 {
     struct xvmc_render_state * render;
     render = (struct xvmc_render_state*)s->current_picture.data[2];
@@ -48,7 +48,7 @@
     s->block = (DCTELEM *)(render->data_blocks+(render->next_free_data_block_num)*64);
 }
 
-void XVMC_pack_pblocks(MpegEncContext *s, int cbp)
+void ff_xvmc_pack_pblocks(MpegEncContext *s, int cbp)
 {
     int i,j;
     const int mb_block_count = 4 + (1 << s->chroma_format);
@@ -67,7 +67,7 @@
 
 //These functions should be called on every new field and/or frame.
 //They should be safe if they are called a few times for the same field!
-int XVMC_field_start(MpegEncContext*s, AVCodecContext *avctx)
+int ff_xvmc_field_start(MpegEncContext*s, AVCodecContext *avctx)
 {
     struct xvmc_render_state * render, * last, * next;
 
@@ -112,7 +112,7 @@
 return -1;
 }
 
-void XVMC_field_end(MpegEncContext *s)
+void ff_xvmc_field_end(MpegEncContext *s)
 {
     struct xvmc_render_state * render;
     render = (struct xvmc_render_state*)s->current_picture.data[2];
@@ -122,7 +122,7 @@
         ff_draw_horiz_band(s,0,0);
 }
 
-void XVMC_decode_mb(MpegEncContext *s)
+void ff_xvmc_decode_mb(MpegEncContext *s)
 {
     XvMCMacroBlock * mv_block;
     struct xvmc_render_state * render;