videolan/ffmpeg
1
Fork 0
mirror of https://git.videolan.org/git/ffmpeg.git synced 2024-10-05 01:51:53 +02:00
Code Releases Activity

Give public #defines that are used by MPlayer an AV_ prefix.

Browse Source 
Originally committed as revision 17244 to svn://svn.ffmpeg.org/ffmpeg/trunk
This commit is contained in:
Diego Biurrun 2009-02-14 17:12:25 +00:00
parent 3ae0192839
commit ea375af8c9
2 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
libavcodec/mpegvideo_xvmc.c
View File

@ -41,7 +41,7 @@ void XVMC_init_block(MpegEncContext *s)
struct xvmc_render_state * render;
render = (struct xvmc_render_state*)s->current_picture.data[2];
assert(render);
if (!render || (render->magic != MP_XVMC_RENDER_MAGIC)) {
if (!render || (render->magic != AV_XVMC_RENDER_MAGIC)) {
assert(0);
return;//make sure that this is a render packet
}
@ -75,7 +75,7 @@ int XVMC_field_start(MpegEncContext*s, AVCodecContext *avctx)
render = (struct xvmc_render_state*)s->current_picture.data[2];
assert(render);
if (!render || (render->magic != MP_XVMC_RENDER_MAGIC))
if (!render || (render->magic != AV_XVMC_RENDER_MAGIC))
return -1;//make sure that this is render packet
render->picture_structure = s->picture_structure;
@ -95,7 +95,7 @@ int XVMC_field_start(MpegEncContext*s, AVCodecContext *avctx)
assert(next);
if (!next)
return -1;
if (next->magic != MP_XVMC_RENDER_MAGIC)
if (next->magic != AV_XVMC_RENDER_MAGIC)
return -1;
render->p_future_surface = next->p_surface;
//no return here, going to set forward prediction
@ -103,7 +103,7 @@ int XVMC_field_start(MpegEncContext*s, AVCodecContext *avctx)
last = (struct xvmc_render_state*)s->last_picture.data[2];
if (!last)// && !s->first_field)
last = render;//predict second field from the first
if (last->magic != MP_XVMC_RENDER_MAGIC)
if (last->magic != AV_XVMC_RENDER_MAGIC)
return -1;
render->p_past_surface = last->p_surface;
return 0;
@ -155,7 +155,7 @@ void XVMC_decode_mb(MpegEncContext *s)
//START OF XVMC specific code
render = (struct xvmc_render_state*)s->current_picture.data[2];
assert(render);
assert(render->magic==MP_XVMC_RENDER_MAGIC);
assert(render->magic==AV_XVMC_RENDER_MAGIC);
assert(render->mv_blocks);
//take the next free macroblock

8
libavcodec/xvmc.h
View File

@ -30,13 +30,13 @@
//the surface should be shown, the video driver manipulates this
#define MP_XVMC_STATE_DISPLAY_PENDING 1
#define AV_XVMC_STATE_DISPLAY_PENDING 1
//the surface is needed for prediction, the codec manipulates this
#define MP_XVMC_STATE_PREDICTION 2
#define AV_XVMC_STATE_PREDICTION 2
//this surface is needed for subpicture rendering
#define MP_XVMC_STATE_OSD_SOURCE 4
#define AV_XVMC_STATE_OSD_SOURCE 4
// 1337 IDCT MCo
#define MP_XVMC_RENDER_MAGIC 0x1DC711C0
#define AV_XVMC_RENDER_MAGIC 0x1DC711C0
struct xvmc_render_state {
//these are not changed by the decoder!