virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-12-23 12:43:46 +02:00
Code Issues Releases Activity

get rid of unused entries in the middle of xvmc_render struct,

Browse Source 
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
This commit is contained in:
Ivan Kalvachev 2007-03-26 15:21:19 +00:00
parent 1890c2acf4
commit d215d07ae0
2 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
libavcodec/avcodec.h
View File

@ -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)

5
libavcodec/xvmc_render.h
View File

@ -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;