From f85190957943777d748ad8fadb8b8a63db4eba83 Mon Sep 17 00:00:00 2001 From: Ivan Kalvachev Date: Sun, 15 Feb 2009 01:28:50 +0000 Subject: [PATCH] Move the state field in the xvmc struct to the extensions section. It has always been a workaround for MPlayer limitations. Originally committed as revision 17305 to svn://svn.ffmpeg.org/ffmpeg/trunk --- libavcodec/xvmc.h | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/libavcodec/xvmc.h b/libavcodec/xvmc.h index 1556e6e47c..e46a9ba4e2 100644 --- a/libavcodec/xvmc.h +++ b/libavcodec/xvmc.h @@ -60,9 +60,6 @@ struct xvmc_render_state { /** modified by calling application and the decoder */ //@{ -#if LIBAVCODEC_VERSION_MAJOR < 53 - int state; ///< 0 - free, 1 - waiting to display, 2 - waiting for prediction -#endif int start_mv_blocks_num; ///< offset in the array for the current slice, updated by vo int filled_mv_blocks_num; ///< processed mv block in this slice, changed by decoder @@ -71,6 +68,7 @@ struct xvmc_render_state { /** extensions may be placed here */ #if LIBAVCODEC_VERSION_MAJOR < 53 //@{ + int state; ///< 0 - free, 1 - waiting to display, 2 - waiting for prediction void* p_osd_target_surface_render; ///< pointer to the surface where subpicture is rendered //}@ #endif