diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2011-08-10 16:29:46 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2011-08-10 16:29:51 +0200 |
| commit | a9aa88df1d8bdef7a3ba520e285c6c5b639d5fd5 (patch) | |
| tree | ad58a7f68309b31b07d54564879e4f60ffdeac88 /libavcodec/version.h | |
| parent | e2cc3311246376e902f0defc6c57bd554babcf39 (diff) | |
| parent | 7221139ba0486c24afeac1f41ba97c75f58046b9 (diff) | |
| download | ffmpeg-a9aa88df1d8bdef7a3ba520e285c6c5b639d5fd5.tar.gz | |
Merge remote-tracking branch 'qatar/master'
* qatar/master:
lavc: make avcodec_init() static on next bump.
ac3enc: remove unneeded #include
ac3enc: restructure coupling coordinate reuse calculation
ac3enc: allow new coupling coordinates to be sent independently for each channel.
ac3enc: separate exponent bit counting from exponent grouping.
h264: propagate error return values for AV_LOG_ERROR-triggering events
aac: Don't attempt to output configure an invalid channel configuration.
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/version.h')
| -rw-r--r-- | libavcodec/version.h | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/libavcodec/version.h b/libavcodec/version.h index bd2f6a599d..adb9c95d94 100644 --- a/libavcodec/version.h +++ b/libavcodec/version.h @@ -80,5 +80,8 @@ #ifndef FF_API_VERY_AGGRESSIVE #define FF_API_VERY_AGGRESSIVE (LIBAVCODEC_VERSION_MAJOR < 54) #endif +#ifndef FF_API_AVCODEC_INIT +#define FF_API_AVCODEC_INIT (LIBAVCODEC_VERSION_MAJOR < 54) +#endif #endif /* AVCODEC_VERSION_H */ |