Merge remote-tracking branch 'qatar/master'
authorMichael Niedermayer <michaelni@gmx.at>
Wed, 24 Apr 2013 08:17:20 +0000 (10:17 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Wed, 24 Apr 2013 08:17:28 +0000 (10:17 +0200)
* qatar/master:
  x86: Get rid of duplication between *_rnd_template.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
1  2 
libavcodec/x86/dsputil_rnd_template.c
libavcodec/x86/hpeldsp_rnd_template.c

Simple merge
Simple merge