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

diff --git a/libavcodec/xvmc.h b/libavcodec/xvmc.h
index 1556e6e..e46a9ba 100644 (file)
--- 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