Michael Niedermayer
684a9152c3
Merge commit 'f0ce9913d0974ac0c7371a62c3324dd2863b5d1b'
...
* commit 'f0ce9913d0974ac0c7371a62c3324dd2863b5d1b':
Rename tpel_template.c ---> pel_template.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-06-13 19:03:55 +02:00
Diego Biurrun
f0ce9913d0
Rename tpel_template.c ---> pel_template.c
...
The new name more accurately describes what the file is about.
2014-06-13 05:21:34 -07:00
Michael Niedermayer
9d6a27d533
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>
2014-03-22 23:26:23 +01:00
Diego Biurrun
57f09608e1
dsputil: Move thirdpel-related bits into their own context
2014-03-22 06:17:30 -07:00
