diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2012-07-19 00:27:46 +0400 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2012-07-19 00:34:48 +0400 |
| commit | 204c4e953d895e15ab0908d715fd46181bf32add (patch) | |
| tree | aebdffe23aa1133eeb1db55b810135ecdfe1c188 /libavcodec/vp56.h | |
| parent | c66978e29ad9cae2c71da83857c6a3cec11bb9cb (diff) | |
| parent | ffdd93a25e64db82c053577f415ea82c54fd5235 (diff) | |
Merge remote-tracking branch 'qatar/master'
* qatar/master:
ppc: fix build with altivec disabled
vp3: move idct and loop filter pointers to new vp3dsp context
build: add CONFIG_VP3DSP, reduce repetition in OBJS lists
tscc2: do not add/subtract 128 bias during DCT
tscc2: fix typo in DCT
configure: clarify external library section of help output
configure: mark libfdk-aac as nonfree
configure: cosmetics: drop some unnecessary backslashes
os_support: K&R formatting cosmetics
Conflicts:
configure
libavcodec/vp3.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/vp56.h')
| -rw-r--r-- | libavcodec/vp56.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/libavcodec/vp56.h b/libavcodec/vp56.h index e135718d20..12f9380b4d 100644 --- a/libavcodec/vp56.h +++ b/libavcodec/vp56.h @@ -30,6 +30,7 @@ #include "dsputil.h" #include "get_bits.h" #include "bytestream.h" +#include "vp3dsp.h" #include "vp56dsp.h" typedef struct vp56_context VP56Context; @@ -91,6 +92,7 @@ typedef struct { struct vp56_context { AVCodecContext *avctx; DSPContext dsp; + VP3DSPContext vp3dsp; VP56DSPContext vp56dsp; ScanTable scantable; AVFrame frames[4]; |