← Back to branch summary

~ubuntu-branches/ubuntu/utopic/libav/utopic-proposed

« back to all changes in this revision

Viewing changes to libavcodec/indeo5.c

  • Committer: Package Import Robot
  • Author(s): Reinhard Tartler, Reinhard Tartler, Rico Tzschichholz
  • Date: 2014-08-30 11:02:45 UTC
  • mfrom: (1.3.47 sid)
  • Revision ID: package-import@ubuntu.com-20140830110245-io3dg7q85wfr7125
Tags: 6:11~beta1-2
[ Reinhard Tartler ]
* Make libavcodec-dev depend on libavresample-dev

[ Rico Tzschichholz ]
* Some fixes and leftovers from soname bumps

Show diffs side-by-side

added added

removed removed

Lines of Context:
libavcodec/indeo5.c
30
30
#define BITSTREAM_READER_LE
31
31
#include "avcodec.h"
32
32
#include "get_bits.h"
33
 
#include "dsputil.h"
34
33
#include "ivi_dsp.h"
35
34
#include "ivi_common.h"
36
35
#include "indeo5data.h"
114
113
 
115
114
    /* check if picture layout was changed and reallocate buffers */
116
115
    if (ivi_pic_config_cmp(&pic_conf, &ctx->pic_conf) || ctx->gop_invalid) {
117
 
        result = ff_ivi_init_planes(ctx->planes, &pic_conf);
 
116
        result = ff_ivi_init_planes(ctx->planes, &pic_conf, 0);
118
117
        if (result < 0) {
119
118
            av_log(avctx, AV_LOG_ERROR, "Couldn't reallocate color planes!\n");
120
119
            return result;
626
625
    ctx->pic_conf.tile_height   = avctx->height;
627
626
    ctx->pic_conf.luma_bands    = ctx->pic_conf.chroma_bands = 1;
628
627
 
629
 
    result = ff_ivi_init_planes(ctx->planes, &ctx->pic_conf);
 
628
    result = ff_ivi_init_planes(ctx->planes, &ctx->pic_conf, 0);
630
629
    if (result) {
631
630
        av_log(avctx, AV_LOG_ERROR, "Couldn't allocate color planes!\n");
632
631
        return AVERROR_INVALIDDATA;
641
640
    ctx->switch_buffers   = switch_buffers;
642
641
    ctx->is_nonnull_frame = is_nonnull_frame;
643
642
 
 
643
    ctx->is_indeo4 = 0;
 
644
 
644
645
    avctx->pix_fmt = AV_PIX_FMT_YUV410P;
645
646
 
646
647
    return 0;