| Index: source/patched-ffmpeg-mt/libavcodec/utils.c
|
| ===================================================================
|
| --- source/patched-ffmpeg-mt/libavcodec/utils.c (revision 59334)
|
| +++ source/patched-ffmpeg-mt/libavcodec/utils.c (working copy)
|
| @@ -216,7 +216,7 @@
|
|
|
| #if LIBAVCODEC_VERSION_MAJOR < 53
|
| int avcodec_check_dimensions(void *av_log_ctx, unsigned int w, unsigned int h){
|
| - return av_check_image_size(w, h, 0, av_log_ctx);
|
| + return av_image_check_size(w, h, 0, av_log_ctx);
|
| }
|
| #endif
|
|
|
| @@ -236,7 +236,7 @@
|
| return -1;
|
| }
|
|
|
| - if(av_check_image_size(w, h, 0, s))
|
| + if(av_image_check_size(w, h, 0, s))
|
| return -1;
|
|
|
| if(s->internal_buffer==NULL){
|
| @@ -289,7 +289,7 @@
|
| do {
|
| // NOTE: do not align linesizes individually, this breaks e.g. assumptions
|
| // that linesize[0] == 2*linesize[1] in the MPEG-encoder for 4:2:2
|
| - av_fill_image_linesizes(picture.linesize, s->pix_fmt, w);
|
| + av_image_fill_linesizes(picture.linesize, s->pix_fmt, w);
|
| // increase alignment of w for next try (rhs gives the lowest bit set in w)
|
| w += w & ~(w-1);
|
|
|
| @@ -299,7 +299,7 @@
|
| }
|
| } while (unaligned);
|
|
|
| - tmpsize = av_fill_image_pointers(picture.data, s->pix_fmt, h, NULL, picture.linesize);
|
| + tmpsize = av_image_fill_pointers(picture.data, s->pix_fmt, h, NULL, picture.linesize);
|
| if (tmpsize < 0)
|
| return -1;
|
|
|
| @@ -495,7 +495,7 @@
|
|
|
| #define SANE_NB_CHANNELS 128U
|
| if (((avctx->coded_width || avctx->coded_height)
|
| - && av_check_image_size(avctx->coded_width, avctx->coded_height, 0, avctx))
|
| + && av_image_check_size(avctx->coded_width, avctx->coded_height, 0, avctx))
|
| || avctx->channels > SANE_NB_CHANNELS) {
|
| ret = AVERROR(EINVAL);
|
| goto free_and_end;
|
| @@ -572,7 +572,7 @@
|
| av_log(avctx, AV_LOG_ERROR, "buffer smaller than minimum size\n");
|
| return -1;
|
| }
|
| - if(av_check_image_size(avctx->width, avctx->height, 0, avctx))
|
| + if(av_image_check_size(avctx->width, avctx->height, 0, avctx))
|
| return -1;
|
| if((avctx->codec->capabilities & CODEC_CAP_DELAY) || pict){
|
| int ret = avctx->codec->encode(avctx, buf, buf_size, pict);
|
| @@ -623,7 +623,7 @@
|
| int threaded = avctx->active_thread_type&FF_THREAD_FRAME;
|
|
|
| *got_picture_ptr= 0;
|
| - if((avctx->coded_width||avctx->coded_height) && av_check_image_size(avctx->coded_width, avctx->coded_height, 0, avctx))
|
| + if((avctx->coded_width||avctx->coded_height) && av_image_check_size(avctx->coded_width, avctx->coded_height, 0, avctx))
|
| return -1;
|
| if((avctx->codec->capabilities & CODEC_CAP_DELAY) || avpkt->size || threaded){
|
| if (HAVE_PTHREADS && threaded) ret = ff_thread_decode_frame(avctx, picture,
|
|
|