Mercurial > libavcodec.hg
comparison mjpegdec.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 | b31e6ace12f6 |
children |
comparison
equal
deleted
inserted
replaced
12461:25174028da0a | 12462:ffb3668ff7af |
---|---|
217 //HACK for odd_height.mov | 217 //HACK for odd_height.mov |
218 if(s->interlaced && s->width == width && s->height == height + 1) | 218 if(s->interlaced && s->width == width && s->height == height + 1) |
219 height= s->height; | 219 height= s->height; |
220 | 220 |
221 av_log(s->avctx, AV_LOG_DEBUG, "sof0: picture: %dx%d\n", width, height); | 221 av_log(s->avctx, AV_LOG_DEBUG, "sof0: picture: %dx%d\n", width, height); |
222 if(av_check_image_size(width, height, 0, s->avctx)) | 222 if(av_image_check_size(width, height, 0, s->avctx)) |
223 return -1; | 223 return -1; |
224 | 224 |
225 nb_components = get_bits(&s->gb, 8); | 225 nb_components = get_bits(&s->gb, 8); |
226 if (nb_components <= 0 || | 226 if (nb_components <= 0 || |
227 nb_components > MAX_COMPONENTS) | 227 nb_components > MAX_COMPONENTS) |