diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-01-24 14:44:34 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-01-24 15:47:47 +0100 |
| commit | fc13a89654b5878050ac07e36254c5e712aa8820 (patch) | |
| tree | 73e35d94880aae72b785ef9d1079c442a552777b /libavcodec/h264.h | |
| parent | 70b0aeba001c61d52965debda4875e610bb2435e (diff) | |
| parent | e9d817351b28e62868528476971afe4cde1fa280 (diff) | |
| download | ffmpeg-fc13a89654b5878050ac07e36254c5e712aa8820.tar.gz | |
Merge remote-tracking branch 'qatar/master'
* qatar/master:
dsputil: Separate h264 qpel
Conflicts:
libavcodec/dsputil_template.c
libavcodec/h264.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/h264.h')
| -rw-r--r-- | libavcodec/h264.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/libavcodec/h264.h b/libavcodec/h264.h index 6989178af2..96148e5095 100644 --- a/libavcodec/h264.h +++ b/libavcodec/h264.h @@ -33,6 +33,7 @@ #include "mpegvideo.h" #include "h264dsp.h" #include "h264pred.h" +#include "h264qpel.h" #include "rectangle.h" #define interlaced_dct interlaced_dct_is_a_bad_name @@ -257,6 +258,7 @@ typedef struct MMCO { typedef struct H264Context { MpegEncContext s; H264DSPContext h264dsp; + H264QpelContext h264qpel; int pixel_shift; ///< 0 for 8-bit H264, 1 for high-bit-depth H264 int chroma_qp[2]; // QPc |