[FFmpeg-cvslog] Merge commit '368f50359eb328b0b9d67451f56fda20b3255f9a'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Fri May 30 02:17:55 2014 +0200| [98a6806fddc2a0e8f402c9ebd7497f4a8d20f536] | committer: Michael Niedermayer

Merge commit '368f50359eb328b0b9d67451f56fda20b3255f9a'

* commit '368f50359eb328b0b9d67451f56fda20b3255f9a':
  dsputil: Split off quarterpel bits into their own context

Conflicts:
	configure
	libavcodec/dsputil.c
	libavcodec/h263dec.c
	libavcodec/mpegvideo.c
	libavcodec/mpegvideo_enc.c
	libavcodec/vc1dec.c
	libavcodec/vc1dsp.c
	libavcodec/x86/dsputil_init.c
	libavcodec/x86/qpeldsp.asm

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

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