diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-07-17 23:27:40 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-07-17 23:27:40 +0200 |
| commit | 3a2d1465c88625774530399b06dc4d48b24bb51f (patch) | |
| tree | 4be7740e2fca1a95af5ec112526c84ca69b64092 /libavcodec/h264.h | |
| parent | 6be71e9955954422227f9691b4f5367a7169b099 (diff) | |
| parent | 2d60444331fca1910510038dd3817bea885c2367 (diff) | |
| download | ffmpeg-3a2d1465c88625774530399b06dc4d48b24bb51f.tar.gz | |
Merge commit '2d60444331fca1910510038dd3817bea885c2367'
* commit '2d60444331fca1910510038dd3817bea885c2367':
dsputil: Split motion estimation compare bits off into their own context
Conflicts:
configure
libavcodec/Makefile
libavcodec/arm/Makefile
libavcodec/dvenc.c
libavcodec/error_resilience.c
libavcodec/h264.h
libavcodec/h264_slice.c
libavcodec/me_cmp.c
libavcodec/me_cmp.h
libavcodec/motion_est.c
libavcodec/motion_est_template.c
libavcodec/mpeg4videoenc.c
libavcodec/mpegvideo.c
libavcodec/mpegvideo_enc.c
libavcodec/x86/Makefile
libavcodec/x86/me_cmp_init.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/h264.h')
| -rw-r--r-- | libavcodec/h264.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/libavcodec/h264.h b/libavcodec/h264.h index 228558b6f4..00f8b7f241 100644 --- a/libavcodec/h264.h +++ b/libavcodec/h264.h @@ -30,13 +30,13 @@ #include "libavutil/intreadwrite.h" #include "cabac.h" -#include "dsputil.h" #include "error_resilience.h" #include "get_bits.h" #include "h264chroma.h" #include "h264dsp.h" #include "h264pred.h" #include "h264qpel.h" +#include "me_cmp.h" #include "mpegutils.h" #include "parser.h" #include "qpeldsp.h" @@ -338,13 +338,13 @@ typedef struct H264Picture { */ typedef struct H264Context { AVCodecContext *avctx; + MECmpContext mecc; VideoDSPContext vdsp; H264DSPContext h264dsp; H264ChromaContext h264chroma; H264QpelContext h264qpel; ParseContext parse_context; GetBitContext gb; - DSPContext dsp; ERContext er; H264Picture *DPB; |