diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2012-12-10 02:13:26 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2012-12-10 02:16:33 +0100 |
| commit | 529d3e002642a9901ae463dea0263768dc843173 (patch) | |
| tree | e022885e2b9c1cee95c30aa2ed53a2ab56831f01 /libavcodec/dsputil.h | |
| parent | a93369845783a5a63e713c143cab2c550a6ccd82 (diff) | |
| parent | 2dd95bd7cfd1acbbac8844739572667f40314b79 (diff) | |
| download | ffmpeg-529d3e002642a9901ae463dea0263768dc843173.tar.gz | |
Merge remote-tracking branch 'qatar/master'
* qatar/master:
dsputil: remove unused macro WRAPPER8_16
configure: fix automatic processing of _extralibs in check_deps
libvpxenc: Support forcing keyframes
ac3dec: decode directly into output buffers
Conflicts:
libavcodec/ac3dec.c
libavcodec/libvpxenc.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/dsputil.h')
| -rw-r--r-- | libavcodec/dsputil.h | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/libavcodec/dsputil.h b/libavcodec/dsputil.h index 1fef07e6ed..4c900a023e 100644 --- a/libavcodec/dsputil.h +++ b/libavcodec/dsputil.h @@ -638,12 +638,6 @@ void ff_dsputil_init_dwt(DSPContext *c); # define LOCAL_ALIGNED_16(t, v, ...) LOCAL_ALIGNED(16, t, v, __VA_ARGS__) #endif -#define WRAPPER8_16(name8, name16)\ -static int name16(void /*MpegEncContext*/ *s, uint8_t *dst, uint8_t *src, int stride, int h){\ - return name8(s, dst , src , stride, h)\ - +name8(s, dst+8 , src+8 , stride, h);\ -} - #define WRAPPER8_16_SQ(name8, name16)\ static int name16(void /*MpegEncContext*/ *s, uint8_t *dst, uint8_t *src, int stride, int h){\ int score=0;\ |