Merge commit 'd3c3c1664a958923f234283e66fbcbfe69a6927f'
authorMichael Niedermayer <michaelni@gmx.at>
Wed, 26 Mar 2014 13:32:12 +0000 (14:32 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Wed, 26 Mar 2014 13:32:24 +0000 (14:32 +0100)
commit152c8fd856e505119c0a2040a9525715fc255c9a
tree4c47a054eed3323ee989ca44103c6a0f054d5ae1
parent8e8347b89291ffa65779f1f8c85eed5d57d80a86
parentd3c3c1664a958923f234283e66fbcbfe69a6927f
Merge commit 'd3c3c1664a958923f234283e66fbcbfe69a6927f'

* commit 'd3c3c1664a958923f234283e66fbcbfe69a6927f':
  dsputil: Move hpel_template #include out of dsputil_template

Merged-by: Michael Niedermayer <michaelni@gmx.at>
libavcodec/dsputil.c
libavcodec/dsputil_template.c
libavcodec/hpel_template.c