[FFmpeg-cvslog] Merge commit 'f0ce9913d0974ac0c7371a62c3324dd2863b5d1b'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Fri Jun 13 19:03:47 2014 +0200| [684a9152c3b9d036c2a46c7ca3b772953e493de6] | committer: Michael Niedermayer

Merge commit 'f0ce9913d0974ac0c7371a62c3324dd2863b5d1b'

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

Merged-by: Michael Niedermayer <michaelni at gmx.at>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=684a9152c3b9d036c2a46c7ca3b772953e493de6
---