[SCM] libav/experimental: get rid of unused entries in the middle of xvmc_render struct, extensions are added to the end of the struct (avoids build issues on 64 bits platform) add osd extension to be used by mplayer (required by the resent changes in the build system) breaking the compability, thus bumping minor lavc version number

[siretart at users.alioth.debian.org]

The following commit has been merged in the experimental branch:
commit d215d07ae08d0c5a29148b5dbbb40a8d9d123f0b
Author: Ivan Kalvachev <ikalvachev at gmail.com>
Date:   Mon Mar 26 15:21:19 2007 +0000

    get rid of unused entries in the middle of xvmc_render struct,
    extensions are added to the end of the struct (avoids build issues on 64 bits platform)
    add osd extension to be used by mplayer (required by the resent changes in the build system)
    breaking the compability, thus bumping minor lavc version number
    
    Originally committed as revision 8527 to svn://svn.ffmpeg.org/ffmpeg/trunk

diff --git a/libavcodec/avcodec.h b/libavcodec/avcodec.h
index ceabc0b..74805d9 100644
--- a/libavcodec/avcodec.h
+++ b/libavcodec/avcodec.h
@@ -37,8 +37,8 @@ extern "C" {
 #define AV_STRINGIFY(s)         AV_TOSTRING(s)
 #define AV_TOSTRING(s) #s
 
-#define LIBAVCODEC_VERSION_INT  ((51<<16)+(40<<8)+1)
-#define LIBAVCODEC_VERSION      51.40.1
+#define LIBAVCODEC_VERSION_INT  ((51<<16)+(40<<8)+2)
+#define LIBAVCODEC_VERSION      51.40.2
 #define LIBAVCODEC_BUILD        LIBAVCODEC_VERSION_INT
 
 #define LIBAVCODEC_IDENT        "Lavc" AV_STRINGIFY(LIBAVCODEC_VERSION)
diff --git a/libavcodec/xvmc_render.h b/libavcodec/xvmc_render.h
index 82dfeb0..37b3422 100644
--- a/libavcodec/xvmc_render.h
+++ b/libavcodec/xvmc_render.h
@@ -10,6 +10,8 @@
 #define MP_XVMC_STATE_DISPLAY_PENDING 1
 //the surface is needed for prediction, codec manipulate this
 #define MP_XVMC_STATE_PREDICTION 2
+//this surface is needed for subpicture rendering
+#define MP_XVMC_STATE_OSD_SOURCE 4
 //                     1337    IDCT MCo
 #define MP_XVMC_RENDER_MAGIC 0x1DC711C0
 
@@ -25,7 +27,6 @@ typedef   struct{
   int idct;//does we use IDCT acceleration?
   int chroma_format;//420,422,444
   int unsigned_intra;//+-128 for intra pictures after clip
-  int reserved1[13];//future extenstions (e.g. gmc,qpel)
   XvMCSurface* p_surface;//pointer to rendered surface, never changed
 
 //these are changed by decoder
@@ -43,5 +44,7 @@ typedef   struct{
   int filled_mv_blocks_num;//processed mv block in this slice,change by decoder
 
   int next_free_data_block_num;//used in add_mv_block, pointer to next free block
+//extensions
+  void * p_osd_target_surface_render;//pointer to the surface where subpicture is rendered
 
 } xvmc_render_state_t;

-- 
Libav/FFmpeg packaging