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)
* commit 'd3c3c1664a958923f234283e66fbcbfe69a6927f':
  dsputil: Move hpel_template #include out of dsputil_template

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

Simple merge
Simple merge
Simple merge