Skip to content

F
ffmpeg
Commit b0c51bbc authored by Michael Niedermayer's avatar Michael Niedermayer
Browse files
Options

h264_mc_template: switch to av_assert 

Signed-off-by: 's avatarMichael Niedermayer <michaelni@gmx.at>
parent 38d1c5a4
Show whitespace changes
Inline Side-by-side
Showing with 3 additions and 3 deletions
libavcodec/h264_mc_template.c
View file @ b0c51bbc
...@@ -71,7 +71,7 @@ static void MCFUNC(hl_motion)(H264Context *h, uint8_t *dest_y, ...@@ -71,7 +71,7 @@ static void MCFUNC(hl_motion)(H264Context *h, uint8_t *dest_y,
const int mb_xy = h->mb_xy; const int mb_xy = h->mb_xy;
const int mb_type = s->current_picture.f.mb_type[mb_xy]; const int mb_type = s->current_picture.f.mb_type[mb_xy];
assert(IS_INTER(mb_type)); av_assert2(IS_INTER(mb_type));
if (HAVE_THREADS && (s->avctx->active_thread_type & FF_THREAD_FRAME)) if (HAVE_THREADS && (s->avctx->active_thread_type & FF_THREAD_FRAME))
await_references(h); await_references(h);
...@@ -103,7 +103,7 @@ static void MCFUNC(hl_motion)(H264Context *h, uint8_t *dest_y, ...@@ -103,7 +103,7 @@ static void MCFUNC(hl_motion)(H264Context *h, uint8_t *dest_y,
} else { } else {
int i; int i;
assert(IS_8X8(mb_type)); av_assert2(IS_8X8(mb_type));
for (i = 0; i < 4; i++) { for (i = 0; i < 4; i++) {
const int sub_mb_type = h->sub_mb_type[i]; const int sub_mb_type = h->sub_mb_type[i];
...@@ -141,7 +141,7 @@ static void MCFUNC(hl_motion)(H264Context *h, uint8_t *dest_y, ...@@ -141,7 +141,7 @@ static void MCFUNC(hl_motion)(H264Context *h, uint8_t *dest_y,
IS_DIR(sub_mb_type, 0, 0), IS_DIR(sub_mb_type, 0, 1)); IS_DIR(sub_mb_type, 0, 0), IS_DIR(sub_mb_type, 0, 1));
} else { } else {
int j; int j;
assert(IS_SUB_4X4(sub_mb_type)); av_assert2(IS_SUB_4X4(sub_mb_type));
for (j = 0; j < 4; j++) { for (j = 0; j < 4; j++) {
int sub_x_offset = x_offset + 2 * (j & 1); int sub_x_offset = x_offset + 2 * (j & 1);
int sub_y_offset = y_offset + (j & 2); int sub_y_offset = y_offset + (j & 2);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment