RepoMirrors
/
ffmpeg
mirror of https://git.ffmpeg.org/ffmpeg.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge commit 'cc1d8c54c19dd14fb851e3e7a7793d6b3bd75e94' 

* commit 'cc1d8c54c19dd14fb851e3e7a7793d6b3bd75e94':
  avcodec: Postpone FF_IDCT_XVIDMMX removal until the next version bump

Merged-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer 2014-08-10 23:41:08 +02:00
parent 788cf6f0c6 cc1d8c54c1
commit d177f27517
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
libavcodec/version.h
View File

@ -154,7 +154,7 @@
#define FF_API_UNUSED_MEMBERS (LIBAVCODEC_VERSION_MAJOR < 57) #define FF_API_UNUSED_MEMBERS (LIBAVCODEC_VERSION_MAJOR < 57)
#endif #endif
#ifndef FF_API_IDCT_XVIDMMX #ifndef FF_API_IDCT_XVIDMMX
#define FF_API_IDCT_XVIDMMX (LIBAVCODEC_VERSION_MAJOR < 56) #define FF_API_IDCT_XVIDMMX (LIBAVCODEC_VERSION_MAJOR < 57)
#endif #endif
#ifndef FF_API_INPUT_PRESERVED #ifndef FF_API_INPUT_PRESERVED
#define FF_API_INPUT_PRESERVED (LIBAVCODEC_VERSION_MAJOR < 57) #define FF_API_INPUT_PRESERVED (LIBAVCODEC_VERSION_MAJOR < 57)