Merge remote-tracking branch 'qatar/master'
authorMichael Niedermayer <michaelni@gmx.at>
Fri, 26 Apr 2013 09:01:00 +0000 (11:01 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Fri, 26 Apr 2013 09:10:57 +0000 (11:10 +0200)
commit721ffc691ab40420e5a4cdf4c3580f4aa33cde0f
treefa9e615edbaf441c16b217d1b31ee68b28ec62d3
parentc4bf74022562036bac3f53f4d5b8b1787d904c24
parent74685f6783e77f2545d48bd2124945ad5be39982
Merge remote-tracking branch 'qatar/master'

* commit '74685f6783e77f2545d48bd2124945ad5be39982':
  x86: Rename dsputil_rnd_template.c to rnd_template.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
libavcodec/x86/dsputil_mmx.c
libavcodec/x86/hpeldsp_rnd_template.c
libavcodec/x86/rnd_template.c