Merge commit '57f09608e1600d1cf1679885a46f5004d522d68f'
authorMichael Niedermayer <michaelni@gmx.at>
Sat, 22 Mar 2014 22:26:23 +0000 (23:26 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Sat, 22 Mar 2014 22:26:23 +0000 (23:26 +0100)
commit9d6a27d5336550c131d2a45fc4b0e90c93e46aca
tree07fe3d8437eda2db2343a9d7d0932870e8018e8e
parent74fed968d1b6f0aec9c08b9ac4fcad4314e0460a
parent57f09608e1600d1cf1679885a46f5004d522d68f
Merge commit '57f09608e1600d1cf1679885a46f5004d522d68f'

* commit '57f09608e1600d1cf1679885a46f5004d522d68f':
  dsputil: Move thirdpel-related bits into their own context

Conflicts:
libavcodec/svq3.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
12 files changed:
configure
doc/optimization.txt
libavcodec/Makefile
libavcodec/dsputil.c
libavcodec/dsputil.h
libavcodec/h264qpel_template.c
libavcodec/hpel_template.c
libavcodec/hpeldsp_template.c
libavcodec/svq3.c
libavcodec/tpel_template.c
libavcodec/tpeldsp.c
libavcodec/tpeldsp.h