comparison mpegvideo.c @ 12372:914f484bb476 libavcodec

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 84df7b6b1929
children ea3d12d95325
comparison
equal deleted inserted replaced
12371:5dffb531b1cc 12372:914f484bb476
26 * @file 26 * @file
27 * The simplest mpeg encoder (well, it was the simplest!). 27 * The simplest mpeg encoder (well, it was the simplest!).
28 */ 28 */
29 29
30 #include "libavutil/intmath.h" 30 #include "libavutil/intmath.h"
31 #include "libavcore/imgutils.h"
31 #include "avcodec.h" 32 #include "avcodec.h"
32 #include "dsputil.h" 33 #include "dsputil.h"
33 #include "internal.h" 34 #include "internal.h"
34 #include "mpegvideo.h" 35 #include "mpegvideo.h"
35 #include "mpegvideo_common.h" 36 #include "mpegvideo_common.h"
508 if(s->avctx->thread_count > MAX_THREADS || (s->avctx->thread_count > s->mb_height && s->mb_height)){ 509 if(s->avctx->thread_count > MAX_THREADS || (s->avctx->thread_count > s->mb_height && s->mb_height)){
509 av_log(s->avctx, AV_LOG_ERROR, "too many threads\n"); 510 av_log(s->avctx, AV_LOG_ERROR, "too many threads\n");
510 return -1; 511 return -1;
511 } 512 }
512 513
513 if((s->width || s->height) && avcodec_check_dimensions(s->avctx, s->width, s->height)) 514 if((s->width || s->height) && av_check_image_size(s->width, s->height, 0, s->avctx))
514 return -1; 515 return -1;
515 516
516 dsputil_init(&s->dsp, s->avctx); 517 dsputil_init(&s->dsp, s->avctx);
517 ff_dct_common_init(s); 518 ff_dct_common_init(s);
518 519