diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2012-12-21 17:18:43 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2012-12-21 17:18:43 +0100 |
| commit | a41bf09d9c56215448f14fb086c9f882eb41ecac (patch) | |
| tree | 541da01619d95763ff0ee46ae0df50125505b3c4 /libavcodec/snow.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/snow.h')
| -rw-r--r-- | libavcodec/snow.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/libavcodec/snow.h b/libavcodec/snow.h index 6d6b086907..2565988a57 100644 --- a/libavcodec/snow.h +++ b/libavcodec/snow.h @@ -108,6 +108,7 @@ typedef struct SnowContext{ AVCodecContext *avctx; RangeCoder c; DSPContext dsp; + VideoDSPContext vdsp; DWTContext dwt; AVFrame new_picture; AVFrame input_picture; ///< new_picture with the internal linesizes |