← Back to branch summary

~ppsspp/ppsspp/ffmpeg

« back to all changes in this revision

Viewing changes to libavcodec/vp6.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/vp6.c
32
32
#include "avcodec.h"
33
33
#include "get_bits.h"
34
34
#include "huffman.h"
 
35
#include "internal.h"
35
36
 
36
37
#include "vp56.h"
37
38
#include "vp56data.h"
92
93
                s->avctx->coded_width  = 16 * cols;
93
94
                s->avctx->coded_height = 16 * rows;
94
95
            } else {
95
 
                avcodec_set_dimensions(s->avctx, 16 * cols, 16 * rows);
 
96
                int ret = ff_set_dimensions(s->avctx, 16 * cols, 16 * rows);
 
97
                if (ret < 0)
 
98
                    return ret;
 
99
 
96
100
                if (s->avctx->extradata_size == 1) {
97
101
                    s->avctx->width  -= s->avctx->extradata[0] >> 4;
98
102
                    s->avctx->height -= s->avctx->extradata[0] & 0x0F;
154
158
        buf_size -= coeff_offset;
155
159
        if (buf_size < 0) {
156
160
            if (s->frames[VP56_FRAME_CURRENT]->key_frame)
157
 
                avcodec_set_dimensions(s->avctx, 0, 0);
 
161
                ff_set_dimensions(s->avctx, 0, 0);
158
162
            return AVERROR_INVALIDDATA;
159
163
        }
160
164
        if (s->use_huffman) {