diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2012-06-07 21:07:17 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2012-06-07 21:07:17 +0200 |
| commit | 4e3fc468284c6401f2ce1d074833da580d7b5a38 (patch) | |
| tree | 3a11ed98d183fc880305bde8f717e35470bef3b9 /libavcodec | |
| parent | 3422e7c39506dd2c24c188c86acc61cdc4da99be (diff) | |
h264_mvpred: use av_assert
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec')
| -rw-r--r-- | libavcodec/h264_mvpred.h | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/libavcodec/h264_mvpred.h b/libavcodec/h264_mvpred.h index 12064c81e7..0a405f7704 100644 --- a/libavcodec/h264_mvpred.h +++ b/libavcodec/h264_mvpred.h @@ -31,9 +31,8 @@ #include "internal.h" #include "avcodec.h" #include "h264.h" +#include "libavutil/avassert.h" -//#undef NDEBUG -#include <assert.h> static av_always_inline int fetch_diagonal_mv(H264Context *h, const int16_t **C, int i, int list, int part_width) @@ -104,7 +103,7 @@ static av_always_inline void pred_motion(H264Context *const h, int n, const int16_t *C; int diagonal_ref, match_count; - assert(part_width == 1 || part_width == 2 || part_width == 4); + av_assert2(part_width == 1 || part_width == 2 || part_width == 4); /* mv_cache * B . . A T T T T @@ -486,7 +485,7 @@ static void fill_decode_caches(H264Context *h, int mb_type) } else { int left_typei = s->current_picture.f.mb_type[left_xy[LTOP] + s->mb_stride]; - assert(left_xy[LTOP] == left_xy[LBOT]); + av_assert2(left_xy[LTOP] == left_xy[LBOT]); if (!((left_typei & type_mask) && (left_type[LTOP] & type_mask))) { h->topleft_samples_available &= 0xDF5F; h->left_samples_available &= 0x5F5F; @@ -611,7 +610,7 @@ static void fill_decode_caches(H264Context *h, int mb_type) int16_t(*mv)[2] = s->current_picture.f.motion_val[list]; if (!USES_LIST(mb_type, list)) continue; - assert(!(IS_DIRECT(mb_type) && !h->direct_spatial_mv_pred)); + av_assert2(!(IS_DIRECT(mb_type) && !h->direct_spatial_mv_pred)); if (USES_LIST(top_type, list)) { const int b_xy = h->mb2b_xy[top_xy] + 3 * b_stride; |