Originally committed as revision 17243 to svn://svn.ffmpeg.org/ffmpeg/trunk
{
struct xvmc_render_state * render;
render = (struct xvmc_render_state*)s->current_picture.data[2];
{
struct xvmc_render_state * render;
render = (struct xvmc_render_state*)s->current_picture.data[2];
- assert(render != NULL);
- if ((render == NULL) || (render->magic != MP_XVMC_RENDER_MAGIC)) {
+ assert(render);
+ if (!render || (render->magic != MP_XVMC_RENDER_MAGIC)) {
assert(0);
return;//make sure that this is a render packet
}
assert(0);
return;//make sure that this is a render packet
}
{
struct xvmc_render_state * render, * last, * next;
{
struct xvmc_render_state * render, * last, * next;
render = (struct xvmc_render_state*)s->current_picture.data[2];
render = (struct xvmc_render_state*)s->current_picture.data[2];
- assert(render != NULL);
- if ((render == NULL) || (render->magic != MP_XVMC_RENDER_MAGIC))
+ assert(render);
+ if (!render || (render->magic != MP_XVMC_RENDER_MAGIC))
return -1;//make sure that this is render packet
render->picture_structure = s->picture_structure;
return -1;//make sure that this is render packet
render->picture_structure = s->picture_structure;
return 0;// no prediction from other frames
case FF_B_TYPE:
next = (struct xvmc_render_state*)s->next_picture.data[2];
return 0;// no prediction from other frames
case FF_B_TYPE:
next = (struct xvmc_render_state*)s->next_picture.data[2];
- assert(next!=NULL);
- if (next == NULL)
+ assert(next);
+ if (!next)
return -1;
if (next->magic != MP_XVMC_RENDER_MAGIC)
return -1;
return -1;
if (next->magic != MP_XVMC_RENDER_MAGIC)
return -1;
//no return here, going to set forward prediction
case FF_P_TYPE:
last = (struct xvmc_render_state*)s->last_picture.data[2];
//no return here, going to set forward prediction
case FF_P_TYPE:
last = (struct xvmc_render_state*)s->last_picture.data[2];
- if (last == NULL)// && !s->first_field)
+ if (!last)// && !s->first_field)
last = render;//predict second field from the first
if (last->magic != MP_XVMC_RENDER_MAGIC)
return -1;
last = render;//predict second field from the first
if (last->magic != MP_XVMC_RENDER_MAGIC)
return -1;
{
struct xvmc_render_state * render;
render = (struct xvmc_render_state*)s->current_picture.data[2];
{
struct xvmc_render_state * render;
render = (struct xvmc_render_state*)s->current_picture.data[2];
- assert(render != NULL);
if (render->filled_mv_blocks_num > 0)
ff_draw_horiz_band(s,0,0);
if (render->filled_mv_blocks_num > 0)
ff_draw_horiz_band(s,0,0);
//START OF XVMC specific code
render = (struct xvmc_render_state*)s->current_picture.data[2];
//START OF XVMC specific code
render = (struct xvmc_render_state*)s->current_picture.data[2];
assert(render->magic==MP_XVMC_RENDER_MAGIC);
assert(render->mv_blocks);
assert(render->magic==MP_XVMC_RENDER_MAGIC);
assert(render->mv_blocks);