diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2012-12-21 20:18:43 +0400 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2012-12-21 20:18:43 +0400 |
| commit | a41bf09d9c56215448f14fb086c9f882eb41ecac (patch) | |
| tree | 541da01619d95763ff0ee46ae0df50125505b3c4 /libavcodec/vp56.h | |
| parent | fb3f28ee289b9ea5106d5a7fa00a1018eb379e65 (diff) | |
| parent | 6906b19346ae8a330bfaa1c16ce535be10789723 (diff) | |
Merge commit '6906b19346ae8a330bfaa1c16ce535be10789723'
* commit '6906b19346ae8a330bfaa1c16ce535be10789723':
lavc: add missing files for arm
lavc: introduce VideoDSPContext
Conflicts:
configure
libavcodec/arm/dsputil_init_armv5te.c
libavcodec/dsputil.c
libavcodec/dsputil.h
libavcodec/dsputil_template.c
libavcodec/h264.c
libavcodec/mpegvideo.h
libavcodec/mpegvideo_enc.c
libavcodec/x86/dsputil_mmx.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 3f6f0e2646..3f0c647432 100644 --- a/libavcodec/vp56.h +++ b/libavcodec/vp56.h @@ -30,6 +30,7 @@ #include "dsputil.h" #include "get_bits.h" #include "bytestream.h" +#include "videodsp.h" #include "vp3dsp.h" #include "vp56dsp.h" @@ -94,6 +95,7 @@ typedef struct VP56Model { struct vp56_context { AVCodecContext *avctx; DSPContext dsp; + VideoDSPContext vdsp; VP3DSPContext vp3dsp; VP56DSPContext vp56dsp; ScanTable scantable; |