diff options
| author | Anton Khirnov <anton@khirnov.net> | 2011-04-12 20:51:40 +0200 |
|---|---|---|
| committer | Anton Khirnov <anton@khirnov.net> | 2011-04-26 08:16:05 +0200 |
| commit | e7021c0ed5d1265d5b4f0f01a01f840196a70415 (patch) | |
| tree | dcb6a114d1a187001a03af53436d7b50aca79cb3 /libavcodec/h264.c | |
| parent | 73a4f7c21bbb179f7542d8a5fedf55fd894fa9da (diff) | |
| download | ffmpeg-streaming-e7021c0ed5d1265d5b4f0f01a01f840196a70415.zip ffmpeg-streaming-e7021c0ed5d1265d5b4f0f01a01f840196a70415.tar.gz | |
lavc: remove FF_API_HURRY_UP cruft
Diffstat (limited to 'libavcodec/h264.c')
| -rw-r--r-- | libavcodec/h264.c | 18 |
1 files changed, 2 insertions, 16 deletions
diff --git a/libavcodec/h264.c b/libavcodec/h264.c index cd7dccc..264afe5 100644 --- a/libavcodec/h264.c +++ b/libavcodec/h264.c @@ -2821,11 +2821,7 @@ static int decode_nal_units(H264Context *h, const uint8_t *buf, int buf_size){ buf_index += consumed; //FIXME do not discard SEI id - if( -#if FF_API_HURRY_UP - (s->hurry_up == 1 && h->nal_ref_idc == 0) || -#endif - (avctx->skip_frame >= AVDISCARD_NONREF && h->nal_ref_idc == 0)) + if(avctx->skip_frame >= AVDISCARD_NONREF && h->nal_ref_idc == 0) continue; again: @@ -2857,9 +2853,6 @@ static int decode_nal_units(H264Context *h, const uint8_t *buf, int buf_size){ (hx->nal_unit_type == NAL_IDR_SLICE) || (h->sei_recovery_frame_cnt >= 0); if(hx->redundant_pic_count==0 -#if FF_API_HURRY_UP - && hx->s.hurry_up < 5 -#endif && (avctx->skip_frame < AVDISCARD_NONREF || hx->nal_ref_idc) && (avctx->skip_frame < AVDISCARD_BIDIR || hx->slice_type_nos!=FF_B_TYPE) && (avctx->skip_frame < AVDISCARD_NONKEY || hx->slice_type_nos==FF_I_TYPE) @@ -2897,9 +2890,6 @@ static int decode_nal_units(H264Context *h, const uint8_t *buf, int buf_size){ if(hx->redundant_pic_count==0 && hx->intra_gb_ptr && hx->s.data_partitioning && s->context_initialized -#if FF_API_HURRY_UP - && s->hurry_up < 5 -#endif && (avctx->skip_frame < AVDISCARD_NONREF || hx->nal_ref_idc) && (avctx->skip_frame < AVDISCARD_BIDIR || hx->slice_type_nos!=FF_B_TYPE) && (avctx->skip_frame < AVDISCARD_NONKEY || hx->slice_type_nos==FF_I_TYPE) @@ -3020,11 +3010,7 @@ static int decode_frame(AVCodecContext *avctx, } if(!(s->flags2 & CODEC_FLAG2_CHUNKS) && !s->current_picture_ptr){ - if (avctx->skip_frame >= AVDISCARD_NONREF -#if FF_API_HURRY_UP - || s->hurry_up -#endif - ) + if (avctx->skip_frame >= AVDISCARD_NONREF) return 0; av_log(avctx, AV_LOG_ERROR, "no frame!\n"); return -1; |
