[FFmpeg-cvslog] Revert "Merge commit '3bc2e89c76e88ae6f1fd5287e0b11abcfc3c601c'" ( Bump libavutil major version to account for the LLS API/ABI changes.)

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Mon Dec 16 23:24:52 2013 +0100| [645c94b61bfd3db8b6290a9d93e76d33099ff9be] | committer: Michael Niedermayer

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

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=645c94b61bfd3db8b6290a9d93e76d33099ff9be
---

 doc/APIchanges      |    2 +-
 libavutil/version.h |    6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/doc/APIchanges b/doc/APIchanges
index d0c4e69..4fe70e4 100644
--- a/doc/APIchanges
+++ b/doc/APIchanges
@@ -10,7 +10,7 @@ libavresample: 2012-10-05
 libpostproc:   2011-04-18
 libswresample: 2011-09-19
 libswscale:    2011-06-20
-libavutil:     2013-12-xx
+libavutil:     2012-10-22
 
 
 API changes, most recent first:
diff --git a/libavutil/version.h b/libavutil/version.h
index 628e239..e7bad6f 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, \