Revision 8ed2ae09 libavcodec/h264.c

View differences:

libavcodec/h264.c
2820 2820

  
2821 2821
        buf_index += consumed;
2822 2822

  
2823
        if(  (s->hurry_up == 1 && h->nal_ref_idc  == 0) //FIXME do not discard SEI id
2824
           ||(avctx->skip_frame >= AVDISCARD_NONREF && h->nal_ref_idc  == 0))
2823
        //FIXME do not discard SEI id
2824
        if(
2825
#if FF_API_HURRY_UP
2826
           (s->hurry_up == 1 && h->nal_ref_idc  == 0) ||
2827
#endif
2828
           (avctx->skip_frame >= AVDISCARD_NONREF && h->nal_ref_idc  == 0))
2825 2829
            continue;
2826 2830

  
2827 2831
      again:
......
2852 2856
            s->current_picture_ptr->key_frame |=
2853 2857
                    (hx->nal_unit_type == NAL_IDR_SLICE) ||
2854 2858
                    (h->sei_recovery_frame_cnt >= 0);
2855
            if(hx->redundant_pic_count==0 && hx->s.hurry_up < 5
2859
            if(hx->redundant_pic_count==0
2860
#if FF_API_HURRY_UP
2861
               && hx->s.hurry_up < 5
2862
#endif
2856 2863
               && (avctx->skip_frame < AVDISCARD_NONREF || hx->nal_ref_idc)
2857 2864
               && (avctx->skip_frame < AVDISCARD_BIDIR  || hx->slice_type_nos!=FF_B_TYPE)
2858 2865
               && (avctx->skip_frame < AVDISCARD_NONKEY || hx->slice_type_nos==FF_I_TYPE)
......
2890 2897

  
2891 2898
            if(hx->redundant_pic_count==0 && hx->intra_gb_ptr && hx->s.data_partitioning
2892 2899
               && s->context_initialized
2900
#if FF_API_HURRY_UP
2893 2901
               && s->hurry_up < 5
2902
#endif
2894 2903
               && (avctx->skip_frame < AVDISCARD_NONREF || hx->nal_ref_idc)
2895 2904
               && (avctx->skip_frame < AVDISCARD_BIDIR  || hx->slice_type_nos!=FF_B_TYPE)
2896 2905
               && (avctx->skip_frame < AVDISCARD_NONKEY || hx->slice_type_nos==FF_I_TYPE)
......
3011 3020
    }
3012 3021

  
3013 3022
    if(!(s->flags2 & CODEC_FLAG2_CHUNKS) && !s->current_picture_ptr){
3014
        if (avctx->skip_frame >= AVDISCARD_NONREF || s->hurry_up) return 0;
3023
        if (avctx->skip_frame >= AVDISCARD_NONREF
3024
#if FF_API_HURRY_UP
3025
                || s->hurry_up
3026
#endif
3027
           )
3028
            return 0;
3015 3029
        av_log(avctx, AV_LOG_ERROR, "no frame!\n");
3016 3030
        return -1;
3017 3031
    }

Also available in: Unified diff