[FFmpeg-cvslog] r17256 - trunk/libavcodec/mpegvideo.c

[Aurelien Jacobs]

diego wrote:

> Author: diego
> Date: Sat Feb 14 19:46:32 2009
> New Revision: 17256
> 
> Log:
> Fix compilation: XVMC_ --> ff_xvmc prefix for xvmc functions.
> 
> Modified:
>    trunk/libavcodec/mpegvideo.c
> 
> Modified: trunk/libavcodec/mpegvideo.c
> ==============================================================================
> --- trunk/libavcodec/mpegvideo.c	Sat Feb 14 19:45:44 2009	(r17255)
> +++ trunk/libavcodec/mpegvideo.c	Sat Feb 14 19:46:32 2009	(r17256)
> @@ -941,7 +941,7 @@ alloc:
>  
>  #if CONFIG_MPEG_XVMC_DECODER
>      if(s->avctx->xvmc_acceleration)
> -        return XVMC_field_start(s, avctx);
> +        return ff_xvmc_field_start(s, avctx);
>  #endif
>      return 0;
>  }
> @@ -954,7 +954,7 @@ void MPV_frame_end(MpegEncContext *s)
>  #if CONFIG_MPEG_XVMC_DECODER
>  //just to make sure that all data is rendered.
>      if(s->avctx->xvmc_acceleration){
> -        XVMC_field_end(s);
> +        ff_xvmc_field_end(s);

You left the old prototypes:
  int  XVMC_field_start(MpegEncContext*s, AVCodecContext *avctx);
  void XVMC_field_end(MpegEncContext *s);

And introduced the following warnings:
libavcodec/mpegvideo.c: In function ?MPV_frame_start?:
libavcodec/mpegvideo.c:944: warning: implicit declaration of function ?ff_xvmc_field_start?
libavcodec/mpegvideo.c: In function ?MPV_frame_end?:
libavcodec/mpegvideo.c:957: warning: implicit declaration of function ?ff_xvmc_field_end?

Aurel