diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-03-26 17:40:49 +0400 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-03-26 17:40:49 +0400 |
| commit | 32620691011186a0a3932bba8ddb078ce5312f22 (patch) | |
| tree | bad6b8eaaaf727a9ba94c38d8bceab5c8f50e1b1 /libavcodec/dsputil.c | |
| parent | 152c8fd856e505119c0a2040a9525715fc255c9a (diff) | |
| parent | e7373585f827d4ec05d952daa3877e8decfe3c08 (diff) | |
Merge commit 'e7373585f827d4ec05d952daa3877e8decfe3c08'
* commit 'e7373585f827d4ec05d952daa3877e8decfe3c08':
dsputil_template: Move bits that are used templatized into separate file
Conflicts:
libavcodec/dsputil_template.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/dsputil.c')
| -rw-r--r-- | libavcodec/dsputil.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/libavcodec/dsputil.c b/libavcodec/dsputil.c index dbe04263fb..edd7b04ae6 100644 --- a/libavcodec/dsputil.c +++ b/libavcodec/dsputil.c @@ -46,13 +46,14 @@ uint32_t ff_square_tab[512] = { 0, }; #define BIT_DEPTH 16 -#include "dsputil_template.c" +#include "dsputilenc_template.c" #undef BIT_DEPTH #define BIT_DEPTH 8 #include "hpel_template.c" #include "tpel_template.c" #include "dsputil_template.c" +#include "dsputilenc_template.c" // 0x7f7f7f7f or 0x7f7f7f7f7f7f7f7f or whatever, depending on the cpu's native arithmetic size #define pb_7f (~0UL / 255 * 0x7f) |