~ubuntu-branches/ubuntu/raring/libav/raring-security

« back to all changes in this revision

Viewing changes to libavcodec/rv10.c

  • Committer: Package Import Robot
  • Author(s): Reinhard Tartler
  • Date: 2011-09-28 09:18:34 UTC
  • mfrom: (1.3.7 sid)
  • Revision ID: package-import@ubuntu.com-20110928091834-w415mnuh06h4zpvc
Tags: 4:0.7.1-7ubuntu2
Revert "Convert package to include multiarch support."

Show diffs side-by-side

added added

removed removed

Lines of Context:
438
438
    s->avctx= avctx;
439
439
    s->out_format = FMT_H263;
440
440
    s->codec_id= avctx->codec_id;
 
441
    avctx->flags |= CODEC_FLAG_EMU_EDGE;
441
442
 
442
443
    s->orig_width = s->width  = avctx->coded_width;
443
444
    s->orig_height= s->height = avctx->coded_height;
542
543
        if(MPV_frame_start(s, avctx) < 0)
543
544
            return -1;
544
545
        ff_er_frame_start(s);
 
546
    } else {
 
547
        if (s->current_picture_ptr->pict_type != s->pict_type) {
 
548
            av_log(s->avctx, AV_LOG_ERROR, "Slice type mismatch\n");
 
549
            return -1;
 
550
        }
545
551
    }
546
552
 
547
553
    av_dlog(avctx, "qscale=%d\n", s->qscale);