diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-07-07 15:04:05 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-07-07 15:08:55 +0200 |
| commit | 462c6cdb8ed256d2063815b67ca4d14e62e25802 (patch) | |
| tree | 324761563d86a2e3e2e8a47dc28e53a407bf8857 /libavcodec/mpegvideo.h | |
| parent | 8324bd51867fdc8a79cbdb5850d36bfd0c741d3f (diff) | |
| parent | 8d686ca59db14900ad5c12b547fb8a7afc8b0b94 (diff) | |
Merge commit '8d686ca59db14900ad5c12b547fb8a7afc8b0b94'
* commit '8d686ca59db14900ad5c12b547fb8a7afc8b0b94':
dsputil: Split off *_8x8basis to a separate context
Conflicts:
libavcodec/dsputil.c
libavcodec/mpegvideo_enc.c
libavcodec/x86/dsputilenc_mmx.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/mpegvideo.h')
| -rw-r--r-- | libavcodec/mpegvideo.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/libavcodec/mpegvideo.h b/libavcodec/mpegvideo.h index fa74831505..795a3bd116 100644 --- a/libavcodec/mpegvideo.h +++ b/libavcodec/mpegvideo.h @@ -38,6 +38,7 @@ #include "hpeldsp.h" #include "idctdsp.h" #include "mpegvideodsp.h" +#include "mpegvideoencdsp.h" #include "put_bits.h" #include "ratecontrol.h" #include "parser.h" @@ -365,6 +366,7 @@ typedef struct MpegEncContext { HpelDSPContext hdsp; IDCTDSPContext idsp; MpegVideoDSPContext mdsp; + MpegvideoEncDSPContext mpvencdsp; QpelDSPContext qdsp; VideoDSPContext vdsp; H263DSPContext h263dsp; |