virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-05-29 21:47:48 +02:00
Code Issues Releases Activity

avcodec/mpegvideo_enc: Use av_assert1() instead of assert()

Browse Source 
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
This commit is contained in:
Michael Niedermayer 2019-02-01 22:53:53 +01:00
parent d1afa7284c
commit 7246bf365a
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
libavcodec/mpegvideo_enc.c
View File

@ -2005,7 +2005,7 @@ FF_ENABLE_DEPRECATION_WARNINGS
av_log(s->avctx, AV_LOG_ERROR, av_log(s->avctx, AV_LOG_ERROR,
"Internal error, negative bits\n"); "Internal error, negative bits\n");
assert(s->repeat_first_field == 0); av_assert1(s->repeat_first_field == 0);
vbv_delay = bits * 90000 / s->avctx->rc_max_rate; vbv_delay = bits * 90000 / s->avctx->rc_max_rate;
min_delay = (minbits * 90000LL + s->avctx->rc_max_rate - 1) / min_delay = (minbits * 90000LL + s->avctx->rc_max_rate - 1) /
@ -3056,7 +3056,7 @@ static int encode_thread(AVCodecContext *c, void *arg){
if(r % d == 0){ if(r % d == 0){
current_packet_size=0; current_packet_size=0;
s->pb.buf_ptr= s->ptr_lastgob; s->pb.buf_ptr= s->ptr_lastgob;
assert(put_bits_ptr(&s->pb) == s->ptr_lastgob); av_assert1(put_bits_ptr(&s->pb) == s->ptr_lastgob);
} }
} }
@ -3642,11 +3642,11 @@ static void set_frame_distances(MpegEncContext * s){
if(s->pict_type==AV_PICTURE_TYPE_B){ if(s->pict_type==AV_PICTURE_TYPE_B){
s->pb_time= s->pp_time - (s->last_non_b_time - s->time); s->pb_time= s->pp_time - (s->last_non_b_time - s->time);
assert(s->pb_time > 0 && s->pb_time < s->pp_time); av_assert1(s->pb_time > 0 && s->pb_time < s->pp_time);
}else{ }else{
s->pp_time= s->time - s->last_non_b_time; s->pp_time= s->time - s->last_non_b_time;
s->last_non_b_time= s->time; s->last_non_b_time= s->time;
assert(s->picture_number==0 || s->pp_time > 0); av_assert1(s->picture_number==0 || s->pp_time > 0);
} }
} }