summaryrefslogtreecommitdiff
path: root/libavcodec/version.h
diff options
context:
space:
mode:
authorZhong Li <zhong.li@intel.com>2019-03-27 19:39:41 +0800
committerZhong Li <zhong.li@intel.com>2019-03-28 21:52:51 +0800
commit391f884675f319b95f5a72a410178516e11c557d (patch)
treed7fc7c87e82b4f27aa052aff04df386e11a9307b /libavcodec/version.h
parentb9a066ae23cbf488faf332cbfd101a3af5b77611 (diff)
lavc/qsvenc_h264: remove the privite option trellis
There are many problems of current qsv trellis option: 1. Duplicated with AVCodecContext definition 2. MFX_TRELLIS_XXX is introduced by MSDK API 1.17 Currently Without MSDK API checking thus may cause compilation issue. 3. user is inclined to enable trellis when set "-trellis 1", but actually it is to disable since MFX_TRELLIS_OFF is equal to 1. 4. It is too complex for user to enable trellis for every frame(I/P/B). Just simply remove the private option, and switch to the AVCodecContext definition. Compatibility should not a big problem (except can't exact map) since the option name is same as AVCodecContext. Signed-off-by: Zhong Li <zhong.li@intel.com> Reviewed-by: Carl Eugen Hoyos <ceffmpeg@gmail.com> Reviewed-by: Moritz Barsnick <barsnick@gmx.net>
Diffstat (limited to 'libavcodec/version.h')
-rw-r--r--libavcodec/version.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/libavcodec/version.h b/libavcodec/version.h
index 348b4d0300..e73390e21f 100644
--- a/libavcodec/version.h
+++ b/libavcodec/version.h
@@ -29,7 +29,7 @@
#define LIBAVCODEC_VERSION_MAJOR 58
#define LIBAVCODEC_VERSION_MINOR 47
-#define LIBAVCODEC_VERSION_MICRO 105
+#define LIBAVCODEC_VERSION_MICRO 106
#define LIBAVCODEC_VERSION_INT AV_VERSION_INT(LIBAVCODEC_VERSION_MAJOR, \
LIBAVCODEC_VERSION_MINOR, \