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/mpegvideo.h | |
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/mpegvideo.h')
-rw-r--r-- | libavcodec/mpegvideo.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/libavcodec/mpegvideo.h b/libavcodec/mpegvideo.h index 3e447ab..3a47ebe 100644 --- a/libavcodec/mpegvideo.h +++ b/libavcodec/mpegvideo.h @@ -390,8 +390,10 @@ typedef struct MpegEncContext { int no_rounding; /**< apply no rounding to motion compensation (MPEG4, msmpeg4, ...) for b-frames rounding mode is always 0 */ +#if FF_API_HURRY_UP int hurry_up; /**< when set to 1 during decoding, b frames will be skipped when set to 2 idct/dequant will be skipped too */ +#endif /* macroblock layer */ int mb_x, mb_y; |