[FFmpeg-cvslog] Merge commit '6647aa0426e73839b9b1d1c9d86188f469167531'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Wed May 29 03:52:16 2013 +0200| [ca90ca8ce365261355f3b66936b9cc011fdd1cdc] | committer: Michael Niedermayer

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 at gmx.at>

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