Mercurial > libavcodec.hg
comparison xvmc.h @ 8908:ac0ad123e3f0 libavcodec
Remove obsolete display_flags member from xvmc struct
and mark state defines as obsolete.
| author | iive |
|---|---|
| date | Sun, 15 Feb 2009 02:17:48 +0000 |
| parents | c9e8aed08d17 |
| children | a11771712f48 |
comparison
equal
deleted
inserted
replaced
| 8907:c9e8aed08d17 | 8908:ac0ad123e3f0 |
|---|---|
| 23 | 23 |
| 24 #include <X11/extensions/XvMC.h> | 24 #include <X11/extensions/XvMC.h> |
| 25 | 25 |
| 26 #include "avcodec.h" | 26 #include "avcodec.h" |
| 27 | 27 |
| 28 #if LIBAVCODEC_VERSION_MAJOR < 53 | |
| 28 #define AV_XVMC_STATE_DISPLAY_PENDING 1 /** the surface should be shown, the video driver manipulates this */ | 29 #define AV_XVMC_STATE_DISPLAY_PENDING 1 /** the surface should be shown, the video driver manipulates this */ |
| 29 #define AV_XVMC_STATE_PREDICTION 2 /** the surface is needed for prediction, the codec manipulates this */ | 30 #define AV_XVMC_STATE_PREDICTION 2 /** the surface is needed for prediction, the codec manipulates this */ |
| 30 #define AV_XVMC_STATE_OSD_SOURCE 4 /** this surface is needed for subpicture rendering */ | 31 #define AV_XVMC_STATE_OSD_SOURCE 4 /** this surface is needed for subpicture rendering */ |
| 32 #endif | |
| 31 #define AV_XVMC_RENDER_MAGIC 0x1DC711C0 /**< magic value to ensure that regular pixel routines haven't corrupted the struct */ | 33 #define AV_XVMC_RENDER_MAGIC 0x1DC711C0 /**< magic value to ensure that regular pixel routines haven't corrupted the struct */ |
| 32 // 1337 IDCT MCo | 34 // 1337 IDCT MCo |
| 33 | 35 |
| 34 struct xvmc_render_state { | 36 struct xvmc_render_state { |
| 35 /** set by calling application */ | 37 /** set by calling application */ |
| 51 XvMCSurface* p_past_surface; ///< pointer to the past surface | 53 XvMCSurface* p_past_surface; ///< pointer to the past surface |
| 52 XvMCSurface* p_future_surface; ///< pointer to the future prediction surface | 54 XvMCSurface* p_future_surface; ///< pointer to the future prediction surface |
| 53 | 55 |
| 54 unsigned int picture_structure; ///< top/bottom fields or frame | 56 unsigned int picture_structure; ///< top/bottom fields or frame |
| 55 unsigned int flags; ///< XVMC_SECOND_FIELD - 1st or 2nd field in the sequence | 57 unsigned int flags; ///< XVMC_SECOND_FIELD - 1st or 2nd field in the sequence |
| 56 #if LIBAVCODEC_VERSION_MAJOR < 53 | |
| 57 unsigned int display_flags; ///< 1, 2 or 1+2 fields for XvMCPutSurface | |
| 58 #endif | |
| 59 //}@ | 58 //}@ |
| 60 | 59 |
| 61 /** Offset in the mv array for the current slice: | 60 /** Offset in the mv array for the current slice: |
| 62 - application - zeros it on get_buffer(). | 61 - application - zeros it on get_buffer(). |
| 63 successful draw_horiz_band() may increment it | 62 successful draw_horiz_band() may increment it |