Mercurial > libavcodec.hg

comparison h264_ps.c @ 12372:914f484bb476 libavcodec

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Remove use of the deprecated function avcodec_check_dimensions(), use av_check_image_size() instead.
author stefano
date Fri, 06 Aug 2010 09:37:04 +0000
parents 572bf2d9931e
children ffb3668ff7af
comparison
equal deleted inserted replaced
12371:5dffb531b1cc 12372:914f484bb476
23 * @file 23 * @file
24 * H.264 / AVC / MPEG4 part10 parameter set decoding. 24 * H.264 / AVC / MPEG4 part10 parameter set decoding.
25 * @author Michael Niedermayer <michaelni@gmx.at> 25 * @author Michael Niedermayer <michaelni@gmx.at>
26 */ 26 */
27 27
28 #include "libavcore/imgutils.h"
28 #include "internal.h" 29 #include "internal.h"
29 #include "dsputil.h" 30 #include "dsputil.h"
30 #include "avcodec.h" 31 #include "avcodec.h"
31 #include "h264.h" 32 #include "h264.h"
32 #include "h264data.h" //FIXME FIXME FIXME (just for zigzag_scan) 33 #include "h264data.h" //FIXME FIXME FIXME (just for zigzag_scan)
339 } 340 }
340 sps->gaps_in_frame_num_allowed_flag= get_bits1(&s->gb); 341 sps->gaps_in_frame_num_allowed_flag= get_bits1(&s->gb);
341 sps->mb_width = get_ue_golomb(&s->gb) + 1; 342 sps->mb_width = get_ue_golomb(&s->gb) + 1;
342 sps->mb_height= get_ue_golomb(&s->gb) + 1; 343 sps->mb_height= get_ue_golomb(&s->gb) + 1;
343 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 ||
344 avcodec_check_dimensions(NULL, 16*sps->mb_width, 16*sps->mb_height)){ 345 av_check_image_size(16*sps->mb_width, 16*sps->mb_height, 0, h->s.avctx)){
345 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");
346 goto fail; 347 goto fail;
347 } 348 }
348 349
349 sps->frame_mbs_only_flag= get_bits1(&s->gb); 350 sps->frame_mbs_only_flag= get_bits1(&s->gb);