diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-08-10 23:41:08 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-08-10 23:41:51 +0200 |
| commit | d177f275170c968837dc0c00bc1f1f3b59426e93 (patch) | |
| tree | b274fe17d0b8031e7fa75ca846277960849d30b5 /libavcodec | |
| parent | 788cf6f0c60739653a1ded8d1fd79a805a16d530 (diff) | |
| parent | cc1d8c54c19dd14fb851e3e7a7793d6b3bd75e94 (diff) | |
Merge commit 'cc1d8c54c19dd14fb851e3e7a7793d6b3bd75e94'
* commit 'cc1d8c54c19dd14fb851e3e7a7793d6b3bd75e94':
avcodec: Postpone FF_IDCT_XVIDMMX removal until the next version bump
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec')
| -rw-r--r-- | libavcodec/version.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libavcodec/version.h b/libavcodec/version.h index 459cd295d6..5769afa9ea 100644 --- a/libavcodec/version.h +++ b/libavcodec/version.h @@ -154,7 +154,7 @@ #define FF_API_UNUSED_MEMBERS (LIBAVCODEC_VERSION_MAJOR < 57) #endif #ifndef FF_API_IDCT_XVIDMMX -#define FF_API_IDCT_XVIDMMX (LIBAVCODEC_VERSION_MAJOR < 56) +#define FF_API_IDCT_XVIDMMX (LIBAVCODEC_VERSION_MAJOR < 57) #endif #ifndef FF_API_INPUT_PRESERVED #define FF_API_INPUT_PRESERVED (LIBAVCODEC_VERSION_MAJOR < 57) |