diff options
| author | Ivan Kalvachev <ikalvachev@gmail.com> | 2009-02-15 02:17:48 +0000 |
|---|---|---|
| committer | Ivan Kalvachev <ikalvachev@gmail.com> | 2009-02-15 02:17:48 +0000 |
| commit | eb3b2ef91d222697e46871fe6efc5b452465b41a (patch) | |
| tree | abb297e11123e45d4c41658f049f09fddb6be132 /libavcodec/xvmc.h | |
| parent | 72d38a749b3e501adfef396c44a939aa2220d8d3 (diff) | |
| download | ffmpeg-eb3b2ef91d222697e46871fe6efc5b452465b41a.tar.gz | |
Remove obsolete display_flags member from xvmc struct
and mark state defines as obsolete.
Originally committed as revision 17307 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'libavcodec/xvmc.h')
| -rw-r--r-- | libavcodec/xvmc.h | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/libavcodec/xvmc.h b/libavcodec/xvmc.h index b871087780..e011ac736a 100644 --- a/libavcodec/xvmc.h +++ b/libavcodec/xvmc.h @@ -25,9 +25,11 @@ #include "avcodec.h" +#if LIBAVCODEC_VERSION_MAJOR < 53 #define AV_XVMC_STATE_DISPLAY_PENDING 1 /** the surface should be shown, the video driver manipulates this */ #define AV_XVMC_STATE_PREDICTION 2 /** the surface is needed for prediction, the codec manipulates this */ #define AV_XVMC_STATE_OSD_SOURCE 4 /** this surface is needed for subpicture rendering */ +#endif #define AV_XVMC_RENDER_MAGIC 0x1DC711C0 /**< magic value to ensure that regular pixel routines haven't corrupted the struct */ // 1337 IDCT MCo @@ -53,9 +55,6 @@ struct xvmc_render_state { unsigned int picture_structure; ///< top/bottom fields or frame unsigned int flags; ///< XVMC_SECOND_FIELD - 1st or 2nd field in the sequence -#if LIBAVCODEC_VERSION_MAJOR < 53 - unsigned int display_flags; ///< 1, 2 or 1+2 fields for XvMCPutSurface -#endif //}@ /** Offset in the mv array for the current slice: |