diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-05-08 14:01:06 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-05-08 14:01:58 +0200 |
| commit | 2f9ef60c97657e5fa47d5f17c5e4714efb672e4e (patch) | |
| tree | 4ea781f1b1ba3f72366a1b3f9d0cb5fbe2963162 /libavcodec/x86/hpeldsp_rnd_template.c | |
| parent | bf18810a215c1313ba868c59a0f778aff01616c1 (diff) | |
| parent | 92f8e06ecb431a427ea13d794e5a6bc927a034d2 (diff) | |
| download | ffmpeg-2f9ef60c97657e5fa47d5f17c5e4714efb672e4e.tar.gz | |
Merge commit '92f8e06ecb431a427ea13d794e5a6bc927a034d2'
* commit '92f8e06ecb431a427ea13d794e5a6bc927a034d2':
x86: dsputil hpeldsp: Move shared template functions into separate object
Conflicts:
libavcodec/x86/Makefile
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/x86/hpeldsp_rnd_template.c')
| -rw-r--r-- | libavcodec/x86/hpeldsp_rnd_template.c | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/libavcodec/x86/hpeldsp_rnd_template.c b/libavcodec/x86/hpeldsp_rnd_template.c index 66bd082a31..b4ecd6a742 100644 --- a/libavcodec/x86/hpeldsp_rnd_template.c +++ b/libavcodec/x86/hpeldsp_rnd_template.c @@ -24,8 +24,6 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -#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) { |