[FFmpeg-cvslog] Merge commit '0e1ad2f591b87e944550c15b54e54f8189743289'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Sat Jan 25 01:33:42 2014 +0100| [2d0d1f7eb3f74449063a4e9f770714f94920b720] | committer: Michael Niedermayer

Merge commit '0e1ad2f591b87e944550c15b54e54f8189743289'

* commit '0e1ad2f591b87e944550c15b54e54f8189743289':
  dxtory: add more compressed and uncompressed modes

Conflicts:
	libavcodec/dxtory.c

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

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