← Back to branch summary

~ppsspp/ppsspp/ffmpeg

« back to all changes in this revision

Viewing changes to libavcodec/sanm.c

  • Committer: Henrik Rydgård
  • Date: 2014-01-03 10:44:32 UTC
  • Revision ID: git-v1:87c6c126784b1718bfa448ecf2e6a9fef781eb4e
Update our ffmpeg snapshot to a clone of the official repository.

This is because Maxim's at3plus support has been officially merged!

Show diffs side-by-side

added added

removed removed

Lines of Context:
libavcodec/sanm.c
738
738
    }
739
739
 
740
740
    if (ctx->width < left + w || ctx->height < top + h) {
741
 
        if (av_image_check_size(FFMAX(left + w, ctx->width),
742
 
                                FFMAX(top  + h, ctx->height), 0, ctx->avctx) < 0)
743
 
            return AVERROR_INVALIDDATA;
744
 
        avcodec_set_dimensions(ctx->avctx, FFMAX(left + w, ctx->width),
745
 
                                           FFMAX(top  + h, ctx->height));
 
741
        int ret = ff_set_dimensions(ctx->avctx, FFMAX(left + w, ctx->width),
 
742
                                                FFMAX(top  + h, ctx->height));
 
743
        if (ret < 0)
 
744
            return ret;
746
745
        init_sizes(ctx, FFMAX(left + w, ctx->width),
747
746
                        FFMAX(top  + h, ctx->height));
748
747
        if (init_buffers(ctx)) {