Revision 8c3eba7c libavcodec/h264.c

View differences:

libavcodec/h264.c
4349 4349
            h->slice_beta_offset = get_se_golomb(&s->gb) << 1;
4350 4350
        }
4351 4351
    }
4352
    if(   s->avctx->skip_loop_filter >= AVDISCARD_ALL
4353
       ||(s->avctx->skip_loop_filter >= AVDISCARD_NONKEY && h->slice_type != I_TYPE)
4354
       ||(s->avctx->skip_loop_filter >= AVDISCARD_BIDIR  && h->slice_type == B_TYPE)
4355
       ||(s->avctx->skip_loop_filter >= AVDISCARD_NONREF && h->nal_ref_idc == 0))
4356
        h->deblocking_filter= 0;
4352 4357

  
4353 4358
#if 0 //FMO
4354 4359
    if( h->pps.num_slice_groups > 1  && h->pps.mb_slice_group_map_type >= 3 && h->pps.mb_slice_group_map_type <= 5)
......
7245 7250

  
7246 7251
        buf_index += consumed;
7247 7252

  
7248
        if( s->hurry_up == 1 && h->nal_ref_idc  == 0 )
7253
        if(  (s->hurry_up == 1 && h->nal_ref_idc  == 0)
7254
           ||(avctx->skip_frame >= AVDISCARD_NONREF && h->nal_ref_idc  == 0))
7249 7255
            continue;
7250 7256
        
7251 7257
        switch(h->nal_unit_type){
......
7261 7267
                av_log(h->s.avctx, AV_LOG_ERROR, "decode_slice_header error\n");
7262 7268
                break;
7263 7269
            }
7264
            if(h->redundant_pic_count==0 && s->hurry_up < 5 )
7270
            if(h->redundant_pic_count==0 && s->hurry_up < 5 && avctx->skip_frame < AVDISCARD_ALL)
7265 7271
                decode_slice(h);
7266 7272
            break;
7267 7273
        case NAL_DPA:
......
7282 7288
            init_get_bits(&h->inter_gb, ptr, bit_length);
7283 7289
            h->inter_gb_ptr= &h->inter_gb;
7284 7290

  
7285
            if(h->redundant_pic_count==0 && h->intra_gb_ptr && s->data_partitioning && s->hurry_up < 5 )
7291
            if(h->redundant_pic_count==0 && h->intra_gb_ptr && s->data_partitioning 
7292
               && s->hurry_up < 5 && avctx->skip_frame < AVDISCARD_ALL)
7286 7293
                decode_slice(h);
7287 7294
            break;
7288 7295
        case NAL_SEI:

Also available in: Unified diff