diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2012-07-15 01:21:05 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2012-07-15 01:23:16 +0200 |
| commit | 39afcf1d7eba8f2f3d59c973aa57df714e679629 (patch) | |
| tree | b56a004e08c68a38cc15becdec66bf528bd26478 /libavcodec/version.h | |
| parent | 2c501ae82b847d89c93e8aa1f4506fb564c344a7 (diff) | |
| parent | 2d497c141d1fb6df290cdf45404b01ea1697d618 (diff) | |
| download | ffmpeg-39afcf1d7eba8f2f3d59c973aa57df714e679629.tar.gz | |
Merge remote-tracking branch 'qatar/master'
* qatar/master:
eval: add gt(), gte(), lt() and lte() fate tests
eval: fix swapping of lt() and lte()
imgconvert: deprecate avcodec_find_best_pix_fmt()
imgconvert: add avcodec_find_best_pix_fmt2()
imgconvert: avoid undefined left shift in avcodec_find_best_pix_fmt
Conflicts:
libavcodec/imgconvert.c
libavcodec/version.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/version.h')
| -rw-r--r-- | libavcodec/version.h | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/libavcodec/version.h b/libavcodec/version.h index 05ee7a9f43..b146635f84 100644 --- a/libavcodec/version.h +++ b/libavcodec/version.h @@ -27,8 +27,8 @@ */ #define LIBAVCODEC_VERSION_MAJOR 54 -#define LIBAVCODEC_VERSION_MINOR 39 -#define LIBAVCODEC_VERSION_MICRO 101 +#define LIBAVCODEC_VERSION_MINOR 40 +#define LIBAVCODEC_VERSION_MICRO 100 #define LIBAVCODEC_VERSION_INT AV_VERSION_INT(LIBAVCODEC_VERSION_MAJOR, \ LIBAVCODEC_VERSION_MINOR, \ @@ -83,5 +83,8 @@ #ifndef FF_API_DSP_MASK #define FF_API_DSP_MASK (LIBAVCODEC_VERSION_MAJOR < 55) #endif +#ifndef FF_API_FIND_BEST_PIX_FMT +#define FF_API_FIND_BEST_PIX_FMT (LIBAVCODEC_VERSION_MAJOR < 55) +#endif #endif /* AVCODEC_VERSION_H */ |