diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2012-10-11 15:54:37 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2012-10-11 15:55:41 +0200 |
| commit | bb35864759197ac17fe0057b0897f14b0fc54788 (patch) | |
| tree | 9ac2a32eb5293d6bcc9dd0fa06c6a660da523532 /libavcodec/sh4 | |
| parent | 526cb36e4b23d2aae14bba0d19947137ee94f263 (diff) | |
| parent | 1ec629308652b382a409ffa61e049c074ee5e695 (diff) | |
| download | ffmpeg-bb35864759197ac17fe0057b0897f14b0fc54788.tar.gz | |
Merge remote-tracking branch 'qatar/master'
* qatar/master:
mlpdsp: adding missing file
dsputil: split out mlp dsp function
sh4: add required #include, fix build
averror: make error values proper negative values
build: do not use LIB as variable name
build: whitespace cosmetics
build: remove single-use variable THIS_LIB
Conflicts:
libavutil/error.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/sh4')
| -rw-r--r-- | libavcodec/sh4/qpel.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/libavcodec/sh4/qpel.c b/libavcodec/sh4/qpel.c index 2e30ae1137..5ad0290b6e 100644 --- a/libavcodec/sh4/qpel.c +++ b/libavcodec/sh4/qpel.c @@ -21,6 +21,8 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ +#include "libavutil/common.h" + #define PIXOP2(OPNAME, OP) \ \ static inline void OPNAME ## _pixels4_l2_aligned(uint8_t *dst, const uint8_t *src1, const uint8_t *src2, int dst_stride, int src_stride1, int src_stride2, int h) \ |