← Back to branch summary

~ppsspp/ppsspp/ffmpeg

« back to all changes in this revision

Viewing changes to libavcodec/dirac.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/dirac.c
30
30
#include "dirac.h"
31
31
#include "avcodec.h"
32
32
#include "golomb.h"
 
33
#include "internal.h"
33
34
#include "mpeg12data.h"
34
35
 
35
36
/* defaults for source parameters */
317
318
    if (ret = parse_source_parameters(avctx, gb, source))
318
319
        return ret;
319
320
 
320
 
    if (ret = av_image_check_size(source->width, source->height, 0, avctx))
 
321
    ret = ff_set_dimensions(avctx, source->width, source->height);
 
322
    if (ret < 0)
321
323
        return ret;
322
324
 
323
 
    avcodec_set_dimensions(avctx, source->width, source->height);
324
 
 
325
325
    /* [DIRAC_STD] picture_coding_mode shall be 0 for fields and 1 for frames
326
326
     * currently only used to signal field coding */
327
327
    picture_coding_mode = svq3_get_ue_golomb(gb);