Merge commit '368f50359eb328b0b9d67451f56fda20b3255f9a'
authorMichael Niedermayer <michaelni@gmx.at>
Fri, 30 May 2014 00:17:55 +0000 (02:17 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Fri, 30 May 2014 00:43:34 +0000 (02:43 +0200)
commit98a6806fddc2a0e8f402c9ebd7497f4a8d20f536
treeb3d874332c592e18430fa091d670130bee02228b
parentd35899ccce39e77a3f7fb667bdfc710c605d03a4
parent368f50359eb328b0b9d67451f56fda20b3255f9a
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@gmx.at>
32 files changed:
configure
libavcodec/Makefile
libavcodec/cavs.c
libavcodec/cavsdsp.h
libavcodec/dsputil.c
libavcodec/dsputil.h
libavcodec/h263dec.c
libavcodec/h264.h
libavcodec/h264_mb.c
libavcodec/h264qpel.h
libavcodec/motion_est.c
libavcodec/mpeg4videodec.c
libavcodec/mpegvideo.c
libavcodec/mpegvideo.h
libavcodec/mpegvideo_enc.c
libavcodec/mpegvideo_motion.c
libavcodec/mss2.c
libavcodec/qpel_template.c
libavcodec/qpeldsp.c
libavcodec/qpeldsp.h
libavcodec/rv34.c
libavcodec/rv34dsp.h
libavcodec/snow.c
libavcodec/snow.h
libavcodec/snowenc.c
libavcodec/vc1dec.c
libavcodec/vc1dsp.c
libavcodec/wmv2dsp.h
libavcodec/x86/Makefile
libavcodec/x86/dsputil_init.c
libavcodec/x86/qpeldsp.asm
libavcodec/x86/qpeldsp_init.c