Revision ce5e49b0 libavcodec/svq1dec.c

View differences:

libavcodec/svq1dec.c
563 563
  if(s->pict_type==4)
564 564
      return -1;
565 565

  
566
  if (s->pict_type == FF_I_TYPE) {
566
  if (s->pict_type == AV_PICTURE_TYPE_I) {
567 567

  
568 568
    /* unknown fields */
569 569
    if (s->f_code == 0x50 || s->f_code == 0x60) {
......
669 669

  
670 670
  //FIXME this avoids some confusion for "B frames" without 2 references
671 671
  //this should be removed after libavcodec can handle more flexible picture types & ordering
672
  if(s->pict_type==FF_B_TYPE && s->last_picture_ptr==NULL) return buf_size;
672
  if(s->pict_type==AV_PICTURE_TYPE_B && s->last_picture_ptr==NULL) return buf_size;
673 673

  
674
  if(  (avctx->skip_frame >= AVDISCARD_NONREF && s->pict_type==FF_B_TYPE)
675
     ||(avctx->skip_frame >= AVDISCARD_NONKEY && s->pict_type!=FF_I_TYPE)
674
  if(  (avctx->skip_frame >= AVDISCARD_NONREF && s->pict_type==AV_PICTURE_TYPE_B)
675
     ||(avctx->skip_frame >= AVDISCARD_NONKEY && s->pict_type!=AV_PICTURE_TYPE_I)
676 676
     || avctx->skip_frame >= AVDISCARD_ALL)
677 677
      return buf_size;
678 678

  
......
699 699

  
700 700
    current  = s->current_picture.data[i];
701 701

  
702
    if(s->pict_type==FF_B_TYPE){
702
    if(s->pict_type==AV_PICTURE_TYPE_B){
703 703
        previous = s->next_picture.data[i];
704 704
    }else{
705 705
        previous = s->last_picture.data[i];
706 706
    }
707 707

  
708
    if (s->pict_type == FF_I_TYPE) {
708
    if (s->pict_type == AV_PICTURE_TYPE_I) {
709 709
      /* keyframe */
710 710
      for (y=0; y < height; y+=16) {
711 711
        for (x=0; x < width; x+=16) {

Also available in: Unified diff