diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-07-07 15:54:17 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-07-07 16:17:27 +0200 |
| commit | 3790801f9cedfae81cb8f055bbb0b14131459658 (patch) | |
| tree | 4fb4e35103252ce0a7cecf1d01041db506078894 /libavcodec/snow.h | |
| parent | 020865f557ccf06a41ecc461fd13ce6678817d04 (diff) | |
| parent | 3c650efb81aaa3b395ba4606ee68a47ee4efb57b (diff) | |
Merge commit '3c650efb81aaa3b395ba4606ee68a47ee4efb57b'
* commit '3c650efb81aaa3b395ba4606ee68a47ee4efb57b':
dsputil: Move draw_edges() to mpegvideoencdsp
Conflicts:
libavcodec/mpegvideo_enc.c
libavcodec/x86/Makefile
libavcodec/x86/dsputil_init.c
libavcodec/x86/dsputil_mmx.c
libavcodec/x86/dsputil_x86.h
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 a9c8518d75..2cda5b323d 100644 --- a/libavcodec/snow.h +++ b/libavcodec/snow.h @@ -115,6 +115,7 @@ typedef struct SnowContext{ QpelDSPContext qdsp; VideoDSPContext vdsp; H264QpelContext h264qpel; + MpegvideoEncDSPContext mpvencdsp; SnowDWTContext dwt; AVFrame *new_picture; AVFrame *input_picture; ///< new_picture with the internal linesizes |