Merge commit '6647aa0426e73839b9b1d1c9d86188f469167531'

* commit '6647aa0426e73839b9b1d1c9d86188f469167531':
  indeo4: add missing Haar and slanted transforms
  dxtory v2 support

Conflicts:
	libavcodec/indeo4.c
	libavcodec/ivi_dsp.c
	libavcodec/version.h

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

diff --cc libavcodec/indeo4.c
Simple merge

diff --cc libavcodec/ivi_dsp.c
Simple merge

diff --cc libavcodec/ivi_dsp.h
index 748b3f4f5596dd7aeec9b69894ced50ea564c3c1,31d37e3f9f7c342fc4e10d6ada02f36a173b436e..245f01d63404474ff68125b536321449afef90d5
--- 1/libavcodec/ivi_dsp.h
--- 2/libavcodec/ivi_dsp.h
+++ b/libavcodec/ivi_dsp.h
@@@ -64,11 -64,72 +64,76 @@@ void ff_ivi_recompose_haar(const IVIPla
   */
  void ff_ivi_inverse_haar_8x8(const int32_t *in, int16_t *out, uint32_t pitch,
                               const uint8_t *flags);
 +void ff_ivi_inverse_haar_8x1(const int32_t *in, int16_t *out, uint32_t pitch,
 +                             const uint8_t *flags);
 +void ff_ivi_inverse_haar_1x8(const int32_t *in, int16_t *out, uint32_t pitch,
 +                             const uint8_t *flags);
  
+ /**
+  *  one-dimensional inverse 8-point Haar transform on rows for Indeo 4
+  *
+  *  @param[in]  in        pointer to the vector of transform coefficients
+  *  @param[out] out       pointer to the output buffer (frame)
+  *  @param[in]  pitch     pitch to move to the next y line
+  *  @param[in]  flags     pointer to the array of column flags:
+  *                        != 0 - non_empty column, 0 - empty one
+  *                        (this array must be filled by caller)
+  */
+ void ff_ivi_row_haar8(const int32_t *in, int16_t *out, uint32_t pitch,
+                       const uint8_t *flags);
+ 
+ /**
+  *  one-dimensional inverse 8-point Haar transform on columns for Indeo 4
+  *
+  *  @param[in]  in        pointer to the vector of transform coefficients
+  *  @param[out] out       pointer to the output buffer (frame)
+  *  @param[in]  pitch     pitch to move to the next y line
+  *  @param[in]  flags     pointer to the array of column flags:
+  *                        != 0 - non_empty column, 0 - empty one
+  *                        (this array must be filled by caller)
+  */
+ void ff_ivi_col_haar8(const int32_t *in, int16_t *out, uint32_t pitch,
+                       const uint8_t *flags);
+ 
+ /**
+  *  two-dimensional inverse Haar 4x4 transform for Indeo 4
+  *
+  *  @param[in]  in        pointer to the vector of transform coefficients
+  *  @param[out] out       pointer to the output buffer (frame)
+  *  @param[in]  pitch     pitch to move to the next y line
+  *  @param[in]  flags     pointer to the array of column flags:
+  *                        != 0 - non_empty column, 0 - empty one
+  *                        (this array must be filled by caller)
+  */
+ void ff_ivi_inverse_haar_4x4(const int32_t *in, int16_t *out, uint32_t pitch,
+                              const uint8_t *flags);
+ 
+ /**
+  *  one-dimensional inverse 4-point Haar transform on rows for Indeo 4
+  *
+  *  @param[in]  in        pointer to the vector of transform coefficients
+  *  @param[out] out       pointer to the output buffer (frame)
+  *  @param[in]  pitch     pitch to move to the next y line
+  *  @param[in]  flags     pointer to the array of column flags:
+  *                        != 0 - non_empty column, 0 - empty one
+  *                        (this array must be filled by caller)
+  */
+ void ff_ivi_row_haar4(const int32_t *in, int16_t *out, uint32_t pitch,
+                       const uint8_t *flags);
+ 
+ /**
+  *  one-dimensional inverse 4-point Haar transform on columns for Indeo 4
+  *
+  *  @param[in]  in        pointer to the vector of transform coefficients
+  *  @param[out] out       pointer to the output buffer (frame)
+  *  @param[in]  pitch     pitch to move to the next y line
+  *  @param[in]  flags     pointer to the array of column flags:
+  *                        != 0 - non_empty column, 0 - empty one
+  *                        (this array must be filled by caller)
+  */
+ void ff_ivi_col_haar4(const int32_t *in, int16_t *out, uint32_t pitch,
+                       const uint8_t *flags);
+ 
  /**
   *  DC-only two-dimensional inverse Haar transform for Indeo 4.
   *  Performing the inverse transform in this case is equivalent to

diff --cc libavcodec/version.h
index 40dc75870f1a029a6f62343a1422412447bdd594,6d17bc9b767dfddb688d0fece9a173a4c74cd6ae..b904048c230a1992044b5c5dcbff1d5fec8c1a6d
--- 1/libavcodec/version.h
--- 2/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  7
 -#define LIBAVCODEC_VERSION_MICRO  2
 +#define LIBAVCODEC_VERSION_MINOR  12
- #define LIBAVCODEC_VERSION_MICRO 101
++#define LIBAVCODEC_VERSION_MICRO 102
  
  #define LIBAVCODEC_VERSION_INT  AV_VERSION_INT(LIBAVCODEC_VERSION_MAJOR, \
                                                 LIBAVCODEC_VERSION_MINOR, \