← Back to branch summary

~ubuntustudio-dev/ffmpeg/debian.git

« back to all changes in this revision

Viewing changes to libavcodec/vc1dec.c

  • Committer: Reinhard Tartler
  • Date: 2012-10-22 18:53:51 UTC
  • mfrom: (1.3.15)
  • Revision ID: git-v1:df56026ccac1282c95345ec056bfddb513478811
Merge tag 'upstream/0.8.4'

Upstream version 0.8.4

Show diffs side-by-side

added added

removed removed

Lines of Context:
libavcodec/vc1dec.c
5710
5710
        mb_height = s->mb_height >> v->field_mode;
5711
5711
        for (i = 0; i <= n_slices; i++) {
5712
5712
            if (i > 0 &&  slices[i - 1].mby_start >= mb_height) {
 
5713
                if (v->field_mode <= 0) {
 
5714
                    av_log(v->s.avctx, AV_LOG_ERROR, "Slice %d starts beyond "
 
5715
                           "picture boundary (%d >= %d)\n", i,
 
5716
                           slices[i - 1].mby_start, mb_height);
 
5717
                    continue;
 
5718
                }
5713
5719
                v->second_field = 1;
5714
5720
                v->blocks_off   = s->mb_width  * s->mb_height << 1;
5715
5721
                v->mb_off       = s->mb_stride * s->mb_height >> 1;
5812
5818
    .init           = vc1_decode_init,
5813
5819
    .close          = vc1_decode_end,
5814
5820
    .decode         = vc1_decode_frame,
 
5821
    .flush          = ff_mpeg_flush,
5815
5822
    .capabilities   = CODEC_CAP_DR1 | CODEC_CAP_DELAY,
5816
5823
    .long_name      = NULL_IF_CONFIG_SMALL("SMPTE VC-1"),
5817
5824
    .pix_fmts       = ff_hwaccel_pixfmt_list_420,
5827
5834
    .init           = vc1_decode_init,
5828
5835
    .close          = vc1_decode_end,
5829
5836
    .decode         = vc1_decode_frame,
 
5837
    .flush          = ff_mpeg_flush,
5830
5838
    .capabilities   = CODEC_CAP_DR1 | CODEC_CAP_DELAY,
5831
5839
    .long_name      = NULL_IF_CONFIG_SMALL("Windows Media Video 9"),
5832
5840
    .pix_fmts       = ff_hwaccel_pixfmt_list_420,