diff options
author | Michael Niedermayer <michaelni@gmx.at> | 2011-04-03 02:28:01 +0200 |
---|---|---|
committer | Michael Niedermayer <michaelni@gmx.at> | 2011-04-03 02:28:01 +0200 |
commit | f35439699f5546774b840ae9fba7df82729ef0ff (patch) | |
tree | 92c22313b8eda656421372955598d647aa64242e /libavcodec/rv34.c | |
parent | 85c9365d65c4d03c468cead13f722ddce89d8495 (diff) | |
parent | bc154882e11f4a218cc8cfb10ae0b4cbc83b5f9f (diff) | |
download | ffmpeg-streaming-f35439699f5546774b840ae9fba7df82729ef0ff.zip ffmpeg-streaming-f35439699f5546774b840ae9fba7df82729ef0ff.tar.gz |
Merge remote branch 'qatar/master'
* qatar/master:
Fixed-point MDCT with 32-bit unscaled output
lavc: deprecate rate_emu
lavc: mark hurry_up for removal on next major bump
parser: mark av_parser_parse() for removal on next major bump
lavc: add missing audioconvert includes
jvdec: don't use deprecated CODEC_TYPE_*/PKT_FLAG_KEY
Conflicts:
libavcodec/h264.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/rv34.c')
-rw-r--r-- | libavcodec/rv34.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/libavcodec/rv34.c b/libavcodec/rv34.c index 08fa8a9..fbfe034 100644 --- a/libavcodec/rv34.c +++ b/libavcodec/rv34.c @@ -1454,15 +1454,19 @@ int ff_rv34_decode_frame(AVCodecContext *avctx, } if((!s->last_picture_ptr || !s->last_picture_ptr->data[0]) && si.type == FF_B_TYPE) return -1; +#if FF_API_HURRY_UP /* skip b frames if we are in a hurry */ if(avctx->hurry_up && si.type==FF_B_TYPE) return buf_size; +#endif if( (avctx->skip_frame >= AVDISCARD_NONREF && si.type==FF_B_TYPE) || (avctx->skip_frame >= AVDISCARD_NONKEY && si.type!=FF_I_TYPE) || avctx->skip_frame >= AVDISCARD_ALL) return buf_size; +#if FF_API_HURRY_UP /* skip everything if we are in a hurry>=5 */ if(avctx->hurry_up>=5) return buf_size; +#endif for(i=0; i<slice_count; i++){ int offset= get_slice_offset(avctx, slices_hdr, i); |