comparison h264_ps.c @ 12462:ffb3668ff7af libavcodec

Use new imgutils.h API names, fix deprecation warnings.
author stefano
date Tue, 07 Sep 2010 19:15:29 +0000
parents 914f484bb476
children
comparison
equal deleted inserted replaced
12461:25174028da0a 12462:ffb3668ff7af
340 } 340 }
341 sps->gaps_in_frame_num_allowed_flag= get_bits1(&s->gb); 341 sps->gaps_in_frame_num_allowed_flag= get_bits1(&s->gb);
342 sps->mb_width = get_ue_golomb(&s->gb) + 1; 342 sps->mb_width = get_ue_golomb(&s->gb) + 1;
343 sps->mb_height= get_ue_golomb(&s->gb) + 1; 343 sps->mb_height= get_ue_golomb(&s->gb) + 1;
344 if((unsigned)sps->mb_width >= INT_MAX/16 || (unsigned)sps->mb_height >= INT_MAX/16 || 344 if((unsigned)sps->mb_width >= INT_MAX/16 || (unsigned)sps->mb_height >= INT_MAX/16 ||
345 av_check_image_size(16*sps->mb_width, 16*sps->mb_height, 0, h->s.avctx)){ 345 av_image_check_size(16*sps->mb_width, 16*sps->mb_height, 0, h->s.avctx)){
346 av_log(h->s.avctx, AV_LOG_ERROR, "mb_width/height overflow\n"); 346 av_log(h->s.avctx, AV_LOG_ERROR, "mb_width/height overflow\n");
347 goto fail; 347 goto fail;
348 } 348 }
349 349
350 sps->frame_mbs_only_flag= get_bits1(&s->gb); 350 sps->frame_mbs_only_flag= get_bits1(&s->gb);