[FFmpeg-cvslog] Merge commit '0d439fbede03854eac8a978cccf21a3425a3c82d'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Tue May 27 23:07:36 2014 +0200| [e2abc0d5cacc22aa900de8ac26160ea1b786a7b5] | committer: Michael Niedermayer

Merge commit '0d439fbede03854eac8a978cccf21a3425a3c82d'

* commit '0d439fbede03854eac8a978cccf21a3425a3c82d':
  dsputil: Split off HuffYUV decoding bits into their own context

Conflicts:
	configure
	libavcodec/dsputil.c
	libavcodec/dsputil.h
	libavcodec/huffyuv.h
	libavcodec/huffyuvdec.c
	libavcodec/lagarith.c
	libavcodec/vble.c
	libavcodec/x86/Makefile
	libavcodec/x86/dsputil.asm
	libavcodec/x86/dsputil_init.c
	libavcodec/x86/dsputil_mmx.c

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

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