Merge remote-tracking branch 'qatar/master'

* commit '74685f67':
  x86: Rename dsputil_rnd_template.c to rnd_template.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>

libavcodec/x86/dsputil_mmx.c

@@ -120,7 +120,7 @@ void ff_put_no_rnd_mpeg4_qpel8_v_lowpass_mmxext(uint8_t *dst, uint8_t *src,
 #define PAVGB(a, b, c, e)               PAVGB_MMX(a, b, c, e)
 #define OP_AVG(a, b, c, e)              PAVGB_MMX(a, b, c, e)
 
-#include "dsputil_rnd_template.c"
+#include "rnd_template.c"
 
 #undef DEF
 #undef SET_RND

libavcodec/x86/hpeldsp_rnd_template.c

@@ -24,7 +24,7 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
-#include "dsputil_rnd_template.c"
+#include "rnd_template.c"
 
 // put_pixels
 static void DEF(put, pixels8_x2)(uint8_t *block, const uint8_t *pixels, ptrdiff_t line_size, int h)