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/snow.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/snow.h')
| -rw-r--r-- | libavcodec/snow.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/libavcodec/snow.h b/libavcodec/snow.h index 83c64c0e1b..a3b0512490 100644 --- a/libavcodec/snow.h +++ b/libavcodec/snow.h @@ -28,6 +28,7 @@ #include "rangecoder.h" #include "mathops.h" #include "mpegvideo.h" +#include "h264qpel.h" #define MID_STATE 128 @@ -109,6 +110,7 @@ typedef struct SnowContext{ RangeCoder c; DSPContext dsp; VideoDSPContext vdsp; + H264QpelContext h264qpel; SnowDWTContext dwt; AVFrame new_picture; AVFrame input_picture; ///< new_picture with the internal linesizes |