diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-04-26 11:01:00 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-04-26 11:10:57 +0200 |
| commit | 721ffc691ab40420e5a4cdf4c3580f4aa33cde0f (patch) | |
| tree | fa9e615edbaf441c16b217d1b31ee68b28ec62d3 | |
| parent | c4bf74022562036bac3f53f4d5b8b1787d904c24 (diff) | |
| parent | 74685f6783e77f2545d48bd2124945ad5be39982 (diff) | |
| download | ffmpeg-721ffc691ab40420e5a4cdf4c3580f4aa33cde0f.tar.gz | |
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>
| -rw-r--r-- | libavcodec/x86/dsputil_mmx.c | 2 | ||||
| -rw-r--r-- | libavcodec/x86/hpeldsp_rnd_template.c | 2 | ||||
| -rw-r--r-- | libavcodec/x86/rnd_template.c (renamed from libavcodec/x86/dsputil_rnd_template.c) | 0 |
3 files changed, 2 insertions, 2 deletions
diff --git a/libavcodec/x86/dsputil_mmx.c b/libavcodec/x86/dsputil_mmx.c index a43a4ff533..24e0e38bbb 100644 --- a/libavcodec/x86/dsputil_mmx.c +++ b/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 diff --git a/libavcodec/x86/hpeldsp_rnd_template.c b/libavcodec/x86/hpeldsp_rnd_template.c index 5b5866d0b6..0f93614708 100644 --- a/libavcodec/x86/hpeldsp_rnd_template.c +++ b/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) diff --git a/libavcodec/x86/dsputil_rnd_template.c b/libavcodec/x86/rnd_template.c index 776530910e..776530910e 100644 --- a/libavcodec/x86/dsputil_rnd_template.c +++ b/libavcodec/x86/rnd_template.c |