diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2011-04-14 03:21:38 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2011-04-14 03:21:38 +0200 |
| commit | c55780dcef1ba87564d8003cded7d045dce9ba34 (patch) | |
| tree | f685b7150db1c7e0f5e65fb2761f3f8bd843f056 /libavcodec/version.h | |
| parent | ff5278d8f6203a9486c0cd63a3aecef4bc2e4f6f (diff) | |
| parent | 651b276ef7ad8d89e89bfc94a4232ab6c36f3a8a (diff) | |
| download | ffmpeg-c55780dcef1ba87564d8003cded7d045dce9ba34.tar.gz | |
Merge remote branch 'qatar/master'
* qatar/master: (32 commits)
libopencore-amr, libvo-amrwbenc: Allow enabling DTX via private AVOptions
libopencore-amr, libvo-amrwbenc: Only check the bitrate when changed
libopencore-amr, libvo-amrwbenc: Find the closest matching bitrate
libvo-*: Fix up the long codec names
libavcodec: Mark AVCodec->priv_class const
swscale: Factorize FAST_BGR2YV12 definition.
libvo-aacenc: Only produce extradata if the global header flag is set
lavf: postpone removal of public metadata conversion API
lavc: postpone removal of request_channels
lavc: postpone removal of audioconvert and sample_fmt wrappers
lavf: postpone removal of deprecated avio functions
libopencore-amr: Cosmetics: Rewrap and align
libopencore-amr, libvo-amrbwenc: Rename variables and functions
libopencore-amr: Convert commented out debug logging into av_dlog
libopencore-amr: Remove an unused state variable
libvo-amrwbenc: Don't explicitly store bitrate modes in the bitrate table
libopencore-amr: Remove a useless local variable
libopencore-amr, libvo-amrwbenc: Make the bitrate/mode mapping array static const
libopencore-amr, libvo-amrwbenc: Return proper error codes in most places
libopencore-amr: Don't print carriage returns in log messages
...
Conflicts:
doc/developer.texi
libavcodec/avcodec.h
libavcodec/libvo-aacenc.c
libavcodec/libvo-amrwbenc.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/version.h')
| -rw-r--r-- | libavcodec/version.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/libavcodec/version.h b/libavcodec/version.h index 78c0f7808d..bad6509a03 100644 --- a/libavcodec/version.h +++ b/libavcodec/version.h @@ -66,10 +66,10 @@ #define FF_API_INOFFICIAL (LIBAVCODEC_VERSION_MAJOR < 53) #endif #ifndef FF_API_OLD_SAMPLE_FMT -#define FF_API_OLD_SAMPLE_FMT (LIBAVCODEC_VERSION_MAJOR < 53) +#define FF_API_OLD_SAMPLE_FMT (LIBAVCODEC_VERSION_MAJOR < 54) #endif #ifndef FF_API_OLD_AUDIOCONVERT -#define FF_API_OLD_AUDIOCONVERT (LIBAVCODEC_VERSION_MAJOR < 53) +#define FF_API_OLD_AUDIOCONVERT (LIBAVCODEC_VERSION_MAJOR < 54) #endif #ifndef FF_API_HURRY_UP #define FF_API_HURRY_UP (LIBAVCODEC_VERSION_MAJOR < 53) @@ -84,7 +84,7 @@ #define FF_API_ANTIALIAS_ALGO (LIBAVCODEC_VERSION_MAJOR < 54) #endif #ifndef FF_API_REQUEST_CHANNELS -#define FF_API_REQUEST_CHANNELS (LIBAVCODEC_VERSION_MAJOR < 53) +#define FF_API_REQUEST_CHANNELS (LIBAVCODEC_VERSION_MAJOR < 54) #endif #endif /* AVCODEC_VERSION_H */ |