comparison xvmc.h @ 8846:9e3956a4fd28 libavcodec

Rename xvmc flags to follow ffmpeg AV_ notion. preserve MP_ ones until next major bump.
author iive
date Sat, 14 Feb 2009 17:24:01 +0000
parents aee8c48ff4b0
children 1b2bb769c9ad
comparison
equal deleted inserted replaced
8845:aee8c48ff4b0 8846:9e3956a4fd28
30 30
31 31
32 //the surface should be shown, the video driver manipulates this 32 //the surface should be shown, the video driver manipulates this
33 #define AV_XVMC_STATE_DISPLAY_PENDING 1 33 #define AV_XVMC_STATE_DISPLAY_PENDING 1
34 //the surface is needed for prediction, the codec manipulates this 34 //the surface is needed for prediction, the codec manipulates this
35 #define AV_XVMC_STATE_PREDICTION 2 35 #define AV_XVMC_STATE_PREDICTION 2
36 //this surface is needed for subpicture rendering 36 //this surface is needed for subpicture rendering
37 #define AV_XVMC_STATE_OSD_SOURCE 4 37 #define AV_XVMC_STATE_OSD_SOURCE 4
38 // 1337 IDCT MCo 38 // 1337 IDCT MCo
39 #define AV_XVMC_RENDER_MAGIC 0x1DC711C0 39 #define AV_XVMC_RENDER_MAGIC 0x1DC711C0
40
41 #if LIBAVCODEC_VERSION_MAJOR < 53
42 #define MP_XVMC_STATE_DISPLAY_PENDING AV_XVMC_STATE_DISPLAY_PENDING
43 #define MP_XVMC_STATE_PREDICTION AV_XVMC_STATE_PREDICTION
44 #define MP_XVMC_STATE_OSD_SOURCE AV_XVMC_STATE_OSD_SOURCE
45 #define MP_XVMC_RENDER_MAGIC AV_XVMC_RENDER_MAGIC
46 #endif
40 47
41 struct xvmc_render_state { 48 struct xvmc_render_state {
42 //these are not changed by the decoder! 49 //these are not changed by the decoder!
43 int magic; ///< used as check for memory corruption by regular pixel routines 50 int magic; ///< used as check for memory corruption by regular pixel routines
44 51