[vlc-commits] VDA: don't bump libavcodec versions

[Jean-Baptiste Kempf]

vlc/vlc-2.1 | branch: master | Jean-Baptiste Kempf <jb at videolan.org> | Tue Sep 17 12:52:47 2013 +0200| [9d4dc58804e5c5e73b2e51ada5b14ef96839e945] | committer: Jean-Baptiste Kempf

VDA: don't bump libavcodec versions

If someone does not use our contribs, it will leak... Too bad.

> http://git.videolan.org/gitweb.cgi/vlc/vlc-2.1.git/?a=commit;h=9d4dc58804e5c5e73b2e51ada5b14ef96839e945
---

 configure.ac                             |   26 +++++++++++++-------------
 contrib/src/ffmpeg/fix-vda-memleak.patch |   17 -----------------
 2 files changed, 13 insertions(+), 30 deletions(-)

diff --git a/configure.ac b/configure.ac
index b10c5b2..9d27075 100644
--- a/configure.ac
+++ b/configure.ac
@@ -2388,24 +2388,24 @@ AS_IF([test "${enable_vda}" != "no"], [
   if test "${SYS}" = "darwin"; then
   AS_IF([test "x${have_avcodec}" = "xyes"], [
     AC_CHECK_HEADERS(VideoDecodeAcceleration/VDADecoder.h,
-    [
-      PKG_CHECK_EXISTS([libavcodec >= 55.19.0], [
-        have_avcodec_vda="yes"
-      ],[
-        AS_IF([test "${enable_vda}" = "yes"],
-         [AC_MSG_ERROR([libavcodec >= 55.19.0 is required for VDA decoding])],
-         [AC_MSG_WARN([libavcodec >= 55.19.0 is required for VDA decoding])])
-      ])
-    ],[
+      [
+        AC_CHECK_HEADERS(libavcodec/vda.h, [
+           have_avcodec_vda="yes"
+        ],[
 	AS_IF([test "${enable_vda}" = "yes"],
-      [AC_MSG_ERROR([Could not find required VideoDecodeAcceleration/VDADecoder.h])],
-      [AC_MSG_WARN([VideoDecodeAcceleration/VDADecoder.h not found])])
-    ])
+	      [AC_MSG_ERROR([vda is present but libavcodec/vda.h is missing])],
+              [AC_MSG_WARN([vda is present but libavcodec/vda.h is missing ])])
+        ])
+  ],[
+	AS_IF([test "${enable_vda}" = "yes"],
+              [AC_MSG_ERROR([Could not find required VideoDecodeAcceleration/VDADecoder.h])],
+              [AC_MSG_WARN([VideoDecodeAcceleration/VDADecoder.h not found])])
+      ])
   ],[
     AS_IF([test "x${enable_vda}" != "x"], [
       AC_MSG_ERROR([--enable-vda and --disable-avcodec options are mutually exclusive.])
     ])
-  ])
+ ])
   fi
 ])
 AM_CONDITIONAL([HAVE_AVCODEC_VDA], [test "${have_avcodec_vda}" = "yes"])
diff --git a/contrib/src/ffmpeg/fix-vda-memleak.patch b/contrib/src/ffmpeg/fix-vda-memleak.patch
index c181a5e..c147a8a 100644
--- a/contrib/src/ffmpeg/fix-vda-memleak.patch
+++ b/contrib/src/ffmpeg/fix-vda-memleak.patch
@@ -8,7 +8,6 @@ Fix a buffer leak when seeking occurs.
 Signed-off-by: Luca Barbato <lu_zero at gentoo.org>
 ---
  libavcodec/vda_h264.c | 25 ++++++++++++++++++++++++-
- libavcodec/version.h  |  2 +-
  2 files changed, 25 insertions(+), 2 deletions(-)
 
 diff --git a/libavcodec/vda_h264.c b/libavcodec/vda_h264.c
@@ -55,19 +54,3 @@ index 6c1845a..7328d58 100644
  
      return status;
  }
-diff --git a/libavcodec/version.h b/libavcodec/version.h
-index 980c5c5..9775a65 100644
---- a/libavcodec/version.h
-+++ b/libavcodec/version.h
-@@ -27,7 +27,7 @@
-  */
- 
- #define LIBAVCODEC_VERSION_MAJOR 55
--#define LIBAVCODEC_VERSION_MINOR 17
-+#define LIBAVCODEC_VERSION_MINOR 19
- #define LIBAVCODEC_VERSION_MICRO  0
- 
- #define LIBAVCODEC_VERSION_INT  AV_VERSION_INT(LIBAVCODEC_VERSION_MAJOR, \
--- 
-1.7.12.4 (Apple Git-37)
-