aboutsummaryrefslogtreecommitdiffstats
path: root/libavutil
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2013-12-16 23:24:52 +0100
committerMichael Niedermayer <michaelni@gmx.at>2013-12-18 03:05:25 +0100
commit645c94b61bfd3db8b6290a9d93e76d33099ff9be (patch)
treed983e4797d79bd7858bdeb68788f1f916c7f22e1 /libavutil
parent3e626548ce6d1ecb86733576dd7272b6ba6352ea (diff)
downloadffmpeg-645c94b61bfd3db8b6290a9d93e76d33099ff9be.tar.gz
Revert "Merge commit '3bc2e89c76e88ae6f1fd5287e0b11abcfc3c601c'" (Bump libavutil major version to account for the LLS API/ABI changes.)
This reverts commit 792845e436ddc5f3ce11ba02535a3372919061f2, reversing changes made to 1d6666a6b828cca6c6b355a9b62f25607b1ced08. Bumping libavutil requires all libraries that use libavutil to have their major version bumped (yes breakage has been confirmed this is not a hypotheses) One case of breakage is due to new types being added to AVOptions and applications that linked to old libavutil and libswresample then trying to use old libavutil (its soname changed so the old isnt updated) and new swresample (its soame didnt change so it is updated) the new swresample contains AVOption types that the old libavutil doesnt know of thus the application attempting to access these avoptions fails AVOptions are used by all libs so the issue can potentially happen with any other lib, libswresample was just the first that showed the problem ive not checked if the other libs are affected currently by the same issue or not Also in addition to AVOptions, AVFrames are also defined in libavutil, bumping it without all libs that use AVFrames could lead to serious inconsistencies when 2 libs/app end up using 2 different libavutils The alternative of bumping all is still possible after this revert, if it turns out to be the preferred solution
Diffstat (limited to 'libavutil')
-rw-r--r--libavutil/version.h6
1 files changed, 3 insertions, 3 deletions
diff --git a/libavutil/version.h b/libavutil/version.h
index 628e239250..e7bad6f9a8 100644
--- a/libavutil/version.h
+++ b/libavutil/version.h
@@ -74,9 +74,9 @@
* @{
*/
-#define LIBAVUTIL_VERSION_MAJOR 53
-#define LIBAVUTIL_VERSION_MINOR 0
-#define LIBAVUTIL_VERSION_MICRO 100
+#define LIBAVUTIL_VERSION_MAJOR 52
+#define LIBAVUTIL_VERSION_MINOR 58
+#define LIBAVUTIL_VERSION_MICRO 101
#define LIBAVUTIL_VERSION_INT AV_VERSION_INT(LIBAVUTIL_VERSION_MAJOR, \
LIBAVUTIL_VERSION_MINOR, \