Merge commit 'f0ce9913d0974ac0c7371a62c3324dd2863b5d1b'
authorMichael Niedermayer <michaelni@gmx.at>
Fri, 13 Jun 2014 17:03:47 +0000 (19:03 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Fri, 13 Jun 2014 17:03:55 +0000 (19:03 +0200)
commit684a9152c3b9d036c2a46c7ca3b772953e493de6
treec9defd5f71ba6209327e0062e5ba7547f7a5f894
parentdffb85a98271826f6b38835b3c38399704bca3c0
parentf0ce9913d0974ac0c7371a62c3324dd2863b5d1b
Merge commit 'f0ce9913d0974ac0c7371a62c3324dd2863b5d1b'

* commit 'f0ce9913d0974ac0c7371a62c3324dd2863b5d1b':
  Rename tpel_template.c ---> pel_template.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
libavcodec/h264qpel_template.c
libavcodec/hpeldsp.c
libavcodec/pel_template.c
libavcodec/qpeldsp.c
libavcodec/tpeldsp.c