From: Michael Niedermayer <michaelni@gmx.at>
Date: Sun, 30 Jun 2013 09:22:15 +0000 (+0200)
Subject: Merge commit '41578f70cf8aec8e7565fba1ca7e07f3dc46c3d2'
X-Git-Tag: android-x86-4.4-r1~2656
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=c93a424718c38c6add273745f3792b531332ea88;p=android-x86%2Fexternal-ffmpeg.git

Merge commit '41578f70cf8aec8e7565fba1ca7e07f3dc46c3d2'

* commit '41578f70cf8aec8e7565fba1ca7e07f3dc46c3d2':
  lpc: use function pointers, in preparation for asm

Merged-by: Michael Niedermayer <michaelni@gmx.at>
---

c93a424718c38c6add273745f3792b531332ea88
diff --cc libavcodec/version.h
index b59cdd2be8,7c82519e06..d0af912e26
--- a/libavcodec/version.h
+++ b/libavcodec/version.h
@@@ -26,11 -26,9 +26,11 @@@
   * Libavcodec version macros.
   */
  
 +#include "libavutil/avutil.h"
 +
  #define LIBAVCODEC_VERSION_MAJOR 55
 -#define LIBAVCODEC_VERSION_MINOR 10
 -#define LIBAVCODEC_VERSION_MICRO  0
 +#define LIBAVCODEC_VERSION_MINOR  17
- #define LIBAVCODEC_VERSION_MICRO 100
++#define LIBAVCODEC_VERSION_MICRO 101
  
  #define LIBAVCODEC_VERSION_INT  AV_VERSION_INT(LIBAVCODEC_VERSION_MAJOR, \
                                                 LIBAVCODEC_VERSION_MINOR, \
diff --cc libavutil/version.h
index 5d4efd6953,fa79e12a68..72c5b117d4
--- a/libavutil/version.h
+++ b/libavutil/version.h
@@@ -74,9 -36,9 +74,9 @@@
   * @{
   */
  
 -#define LIBAVUTIL_VERSION_MAJOR 52
 -#define LIBAVUTIL_VERSION_MINOR 13
 -#define LIBAVUTIL_VERSION_MICRO  0
 +#define LIBAVUTIL_VERSION_MAJOR  52
 +#define LIBAVUTIL_VERSION_MINOR  37
- #define LIBAVUTIL_VERSION_MICRO 101
++#define LIBAVUTIL_VERSION_MICRO 102
  
  #define LIBAVUTIL_VERSION_INT   AV_VERSION_INT(LIBAVUTIL_VERSION_MAJOR, \
                                                 LIBAVUTIL_VERSION_MINOR, \