Remove asserts that are immediately followed by a check and error return.
Originally committed as revision 17303 to svn://svn.ffmpeg.org/ffmpeg/trunk
This commit is contained in:
@@ -70,7 +70,6 @@ int ff_xvmc_field_start(MpegEncContext*s, AVCodecContext *avctx)
|
|||||||
struct xvmc_render_state *last, *next, *render = (struct xvmc_render_state*)s->current_picture.data[2];
|
struct xvmc_render_state *last, *next, *render = (struct xvmc_render_state*)s->current_picture.data[2];
|
||||||
|
|
||||||
assert(avctx);
|
assert(avctx);
|
||||||
assert(render);
|
|
||||||
if (!render || render->magic != AV_XVMC_RENDER_MAGIC)
|
if (!render || render->magic != AV_XVMC_RENDER_MAGIC)
|
||||||
return -1; // make sure that this is a render packet
|
return -1; // make sure that this is a render packet
|
||||||
|
|
||||||
@@ -92,7 +91,6 @@ int ff_xvmc_field_start(MpegEncContext*s, AVCodecContext *avctx)
|
|||||||
return 0; // no prediction from other frames
|
return 0; // no prediction from other frames
|
||||||
case FF_B_TYPE:
|
case FF_B_TYPE:
|
||||||
next = (struct xvmc_render_state*)s->next_picture.data[2];
|
next = (struct xvmc_render_state*)s->next_picture.data[2];
|
||||||
assert(next);
|
|
||||||
if (!next)
|
if (!next)
|
||||||
return -1;
|
return -1;
|
||||||
if (next->magic != AV_XVMC_RENDER_MAGIC)
|
if (next->magic != AV_XVMC_RENDER_MAGIC)
|
||||||
|
Reference in New Issue
Block a user