Merge commit '41578f70cf8aec8e7565fba1ca7e07f3dc46c3d2'
authorMichael Niedermayer <michaelni@gmx.at>
Sun, 30 Jun 2013 09:22:15 +0000 (11:22 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Sun, 30 Jun 2013 09:23:43 +0000 (11:23 +0200)
* commit '41578f70cf8aec8e7565fba1ca7e07f3dc46c3d2':
  lpc: use function pointers, in preparation for asm

Merged-by: Michael Niedermayer <michaelni@gmx.at>
1  2 
libavcodec/lpc.c
libavcodec/version.h
libavutil/lls.c
libavutil/lls.h
libavutil/version.h

Simple merge
   * 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/lls.c
Simple merge
diff --cc libavutil/lls.h
Simple merge
@@@ -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, \