Commit f8519095 authored by Ivan Kalvachev's avatar Ivan Kalvachev

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
parent 967d2ae6
...@@ -60,9 +60,6 @@ struct xvmc_render_state { ...@@ -60,9 +60,6 @@ struct xvmc_render_state {
/** modified by calling application and the decoder */ /** 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 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 int filled_mv_blocks_num; ///< processed mv block in this slice, changed by decoder
...@@ -71,6 +68,7 @@ struct xvmc_render_state { ...@@ -71,6 +68,7 @@ struct xvmc_render_state {
/** extensions may be placed here */ /** extensions may be placed here */
#if LIBAVCODEC_VERSION_MAJOR < 53 #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 void* p_osd_target_surface_render; ///< pointer to the surface where subpicture is rendered
//}@ //}@
#endif #endif
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment