diff options
author | Anton Khirnov <anton@khirnov.net> | 2011-04-12 20:46:49 +0200 |
---|---|---|
committer | Anton Khirnov <anton@khirnov.net> | 2011-04-19 19:01:22 +0200 |
commit | 3453a231a6cebe5989c213be0f9fd6c71ec5ea23 (patch) | |
tree | ebf9befb416b5ea11a4ab214e72e36e886b1e3f9 /libavcodec/xvmc.h | |
parent | 251cf997cff7f3869bca043d20ba771e0588cae3 (diff) | |
download | ffmpeg-3453a231a6cebe5989c213be0f9fd6c71ec5ea23.tar.gz |
lavc: remove misc disabled cruft.
Diffstat (limited to 'libavcodec/xvmc.h')
-rw-r--r-- | libavcodec/xvmc.h | 21 |
1 files changed, 0 insertions, 21 deletions
diff --git a/libavcodec/xvmc.h b/libavcodec/xvmc.h index 6e18a88a16..1239015fcd 100644 --- a/libavcodec/xvmc.h +++ b/libavcodec/xvmc.h @@ -25,11 +25,6 @@ #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 /** the surface is needed for subpicture rendering */ -#endif #define AV_XVMC_ID 0x1DC711C0 /**< special value to ensure that regular pixel routines haven't corrupted the struct the number is 1337 speak for the letters IDCT MCo (motion compensation) */ @@ -151,22 +146,6 @@ struct xvmc_pix_fmt { of coded blocks it contains. */ int next_free_data_block_num; - -/** extensions may be placed here */ -#if LIBAVCODEC_VERSION_MAJOR < 53 -//@{ - /** State flags used to work around limitations in the MPlayer video system. - 0 - Surface is not used. - 1 - Surface is still held in application to be displayed or is - still visible. - 2 - Surface is still held in libavcodec buffer for prediction. - */ - int state; - - /** pointer to the surface where the subpicture is rendered */ - void* p_osd_target_surface_render; -//}@ -#endif }; #endif /* AVCODEC_XVMC_H */ |