[FFmpeg-cvslog] r17263 - trunk/libavcodec/xvmc.h
diego
subversion
Sat Feb 14 20:08:47 CET 2009
Author: diego
Date: Sat Feb 14 20:08:47 2009
New Revision: 17263
Log:
Remove compatibility layer for old names of xvmc definitions.
The header was non-public before and the only user, MPlayer, was updated.
Modified:
trunk/libavcodec/xvmc.h
Modified: trunk/libavcodec/xvmc.h
==============================================================================
--- trunk/libavcodec/xvmc.h Sat Feb 14 20:05:07 2009 (r17262)
+++ trunk/libavcodec/xvmc.h Sat Feb 14 20:08:47 2009 (r17263)
@@ -23,21 +23,12 @@
#include <X11/extensions/XvMC.h>
-#include "avcodec.h"
-
#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 */
#define AV_XVMC_RENDER_MAGIC 0x1DC711C0 /**< magic value to ensure that regular pixel routines haven't corrupted the struct */
// 1337 IDCT MCo
-#if LIBAVCODEC_VERSION_MAJOR < 53
-#define MP_XVMC_STATE_DISPLAY_PENDING AV_XVMC_STATE_DISPLAY_PENDING
-#define MP_XVMC_STATE_PREDICTION AV_XVMC_STATE_PREDICTION
-#define MP_XVMC_STATE_OSD_SOURCE AV_XVMC_STATE_OSD_SOURCE
-#define MP_XVMC_RENDER_MAGIC AV_XVMC_RENDER_MAGIC
-#endif
-
struct xvmc_render_state {
/** set by calling application */
//@{
More information about the ffmpeg-cvslog
mailing list