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/version.h | |
| parent | 85c9365d65c4d03c468cead13f722ddce89d8495 (diff) | |
| parent | bc154882e11f4a218cc8cfb10ae0b4cbc83b5f9f (diff) | |
| download | ffmpeg-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/version.h')
| -rw-r--r-- | libavcodec/version.h | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/libavcodec/version.h b/libavcodec/version.h index 5aa0b82c45..9d211b90fe 100644 --- a/libavcodec/version.h +++ b/libavcodec/version.h @@ -71,5 +71,11 @@ #ifndef FF_API_OLD_AUDIOCONVERT #define FF_API_OLD_AUDIOCONVERT (LIBAVCODEC_VERSION_MAJOR < 53) #endif +#ifndef FF_API_HURRY_UP +#define FF_API_HURRY_UP (LIBAVCODEC_VERSION_MAJOR < 53) +#endif +#ifndef FF_API_RATE_EMU +#define FF_API_RATE_EMU (LIBAVCODEC_VERSION_MAJOR < 53) +#endif #endif /* AVCODEC_VERSION_H */ |