diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2012-07-09 15:38:16 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2012-07-09 15:38:16 +0200 |
| commit | cdb3f2f5f0704a7795ea5cd2ecdd1ec11420db0b (patch) | |
| tree | af74227d9eb4f333ff01d3f2bf7455b6950b0f53 | |
| parent | c88a832735e3ea3eb30d5df8afbe408ce2e6be43 (diff) | |
mpeg12enc: switch to av_assert
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
| -rw-r--r-- | libavcodec/mpeg12enc.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/libavcodec/mpeg12enc.c b/libavcodec/mpeg12enc.c index ae71b8ec0b..6ca2c8430d 100644 --- a/libavcodec/mpeg12enc.c +++ b/libavcodec/mpeg12enc.c @@ -323,7 +323,7 @@ static inline void encode_mb_skip_run(MpegEncContext *s, int run){ static av_always_inline void put_qscale(MpegEncContext *s) { if(s->q_scale_type){ - assert(s->qscale>=1 && s->qscale <=12); + av_assert2(s->qscale>=1 && s->qscale <=12); put_bits(&s->pb, 5, inv_non_linear_qscale[s->qscale]); }else{ put_bits(&s->pb, 5, s->qscale); @@ -395,7 +395,7 @@ void ff_mpeg1_encode_picture_header(MpegEncContext *s, int picture_number) } put_bits(&s->pb, 2, s->intra_dc_precision); - assert(s->picture_structure == PICT_FRAME); + av_assert0(s->picture_structure == PICT_FRAME); put_bits(&s->pb, 2, s->picture_structure); if (s->progressive_sequence) { put_bits(&s->pb, 1, 0); /* no repeat */ @@ -474,7 +474,7 @@ static av_always_inline void mpeg1_encode_mb_internal(MpegEncContext *s, } } else { if(first_mb){ - assert(s->mb_skip_run == 0); + av_assert0(s->mb_skip_run == 0); encode_mb_skip_run(s, s->mb_x); }else{ encode_mb_skip_run(s, s->mb_skip_run); @@ -537,7 +537,7 @@ static av_always_inline void mpeg1_encode_mb_internal(MpegEncContext *s, s->last_mv[0][1][0]= s->last_mv[0][0][0]= motion_x; s->last_mv[0][1][1]= s->last_mv[0][0][1]= motion_y; }else{ - assert(!s->frame_pred_frame_dct && s->mv_type == MV_TYPE_FIELD); + av_assert2(!s->frame_pred_frame_dct && s->mv_type == MV_TYPE_FIELD); if (cbp) { if(s->dquant){ @@ -604,8 +604,8 @@ static av_always_inline void mpeg1_encode_mb_internal(MpegEncContext *s, s->b_count++; } }else{ - assert(s->mv_type == MV_TYPE_FIELD); - assert(!s->frame_pred_frame_dct); + av_assert2(s->mv_type == MV_TYPE_FIELD); + av_assert2(!s->frame_pred_frame_dct); if (cbp){ // With coded bloc pattern if (s->dquant) { if(s->mv_dir == MV_DIR_FORWARD) @@ -700,7 +700,7 @@ static void mpeg1_encode_motion(MpegEncContext *s, int val, int f_or_b_code) sign = 1; } - assert(code > 0 && code <= 16); + av_assert2(code > 0 && code <= 16); put_bits(&s->pb, ff_mpeg12_mbMotionVectorTable[code][1], |