[FFmpeg-cvslog] Merge commit '512f3ffe9b4bb86767c2b1176554407c75fe1a5c'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Wed May 28 00:03:59 2014 +0200| [48a691630833d6b12905475b6bf39fef285872a9] | committer: Michael Niedermayer

Merge commit '512f3ffe9b4bb86767c2b1176554407c75fe1a5c'

* commit '512f3ffe9b4bb86767c2b1176554407c75fe1a5c':
  dsputil: Split off HuffYUV encoding bits into their own context

Conflicts:
	configure
	libavcodec/dsputil.c
	libavcodec/dsputil.h
	libavcodec/huffyuv.h
	libavcodec/huffyuvenc.c
	libavcodec/pngenc.c
	libavcodec/x86/dsputilenc_mmx.c

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

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