← Back to branch summary

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

« back to all changes in this revision

Viewing changes to libavcodec/vc1.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/vc1.c
478
478
                      v->s.avctx->width * h,
479
479
                      1 << 30);
480
480
        }
 
481
        ff_set_sar(v->s.avctx, v->s.avctx->sample_aspect_ratio);
481
482
        av_log(v->s.avctx, AV_LOG_DEBUG, "Aspect: %i:%i\n",
482
483
               v->s.avctx->sample_aspect_ratio.num,
483
484
               v->s.avctx->sample_aspect_ratio.den);
848
849
        v->s.pict_type = (v->fptype & 1) ? AV_PICTURE_TYPE_P : AV_PICTURE_TYPE_I;
849
850
        if (v->fptype & 4)
850
851
            v->s.pict_type = (v->fptype & 1) ? AV_PICTURE_TYPE_BI : AV_PICTURE_TYPE_B;
851
 
        v->s.current_picture_ptr->f.pict_type = v->s.pict_type;
 
852
        v->s.current_picture_ptr->f->pict_type = v->s.pict_type;
852
853
        if (!v->pic_header_flag)
853
854
            goto parse_common_info;
854
855
    }
1687
1688
    v->pq      = -1;
1688
1689
    v->mvrange = 0; /* 7.1.1.18, p80 */
1689
1690
 
 
1691
    ff_vc1dsp_init(&v->vc1dsp);
 
1692
 
1690
1693
    return 0;
1691
1694
}