From 117f9234c8ce6ca8abd57ff541ac3ed0e72b5b5c Mon Sep 17 00:00:00 2001
From: Ivan Kalvachev <ikalvachev@gmail.com>
Date: Sat, 14 Feb 2009 17:24:01 +0000
Subject: [PATCH] Rename xvmc flags to follow ffmpeg AV_ notion. preserve MP_
 ones until next major bump.

Originally committed as revision 17245 to svn://svn.ffmpeg.org/ffmpeg/trunk
---
 libavcodec/xvmc.h | 15 +++++++++++----
 1 file changed, 11 insertions(+), 4 deletions(-)

diff --git a/libavcodec/xvmc.h b/libavcodec/xvmc.h
index 9c37e67d53..39905113f3 100644
--- a/libavcodec/xvmc.h
+++ b/libavcodec/xvmc.h
@@ -32,11 +32,18 @@
 //the surface should be shown, the video driver manipulates this
 #define AV_XVMC_STATE_DISPLAY_PENDING 1
 //the surface is needed for prediction, the codec manipulates this
-#define AV_XVMC_STATE_PREDICTION 2
+#define AV_XVMC_STATE_PREDICTION      2
 //this surface is needed for subpicture rendering
-#define AV_XVMC_STATE_OSD_SOURCE 4
-//                     1337    IDCT MCo
-#define AV_XVMC_RENDER_MAGIC 0x1DC711C0
+#define AV_XVMC_STATE_OSD_SOURCE      4
+//                              1337    IDCT MCo
+#define AV_XVMC_RENDER_MAGIC          0x1DC711C0
+
+#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 {
     //these are not changed by the decoder!