diff options
| author | Ivan Kalvachev <ikalvachev@gmail.com> | 2009-02-15 01:28:50 +0000 |
|---|---|---|
| committer | Ivan Kalvachev <ikalvachev@gmail.com> | 2009-02-15 01:28:50 +0000 |
| commit | f85190957943777d748ad8fadb8b8a63db4eba83 (patch) | |
| tree | b9988d1c7cf0fd49f288ba706924055fdbde611e /libavcodec | |
| parent | 967d2ae616a1fc6ffc2c00810e09c232dfdb7911 (diff) | |
| download | ffmpeg-f85190957943777d748ad8fadb8b8a63db4eba83.tar.gz | |
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
Diffstat (limited to 'libavcodec')
| -rw-r--r-- | libavcodec/xvmc.h | 4 |
1 files changed, 1 insertions, 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 |