diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-05-30 02:17:55 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-05-30 02:43:34 +0200 |
| commit | 98a6806fddc2a0e8f402c9ebd7497f4a8d20f536 (patch) | |
| tree | b3d874332c592e18430fa091d670130bee02228b /libavcodec/h264qpel.h | |
| parent | d35899ccce39e77a3f7fb667bdfc710c605d03a4 (diff) | |
| parent | 368f50359eb328b0b9d67451f56fda20b3255f9a (diff) | |
| download | ffmpeg-streaming-98a6806fddc2a0e8f402c9ebd7497f4a8d20f536.zip ffmpeg-streaming-98a6806fddc2a0e8f402c9ebd7497f4a8d20f536.tar.gz | |
Merge commit '368f50359eb328b0b9d67451f56fda20b3255f9a'
* commit '368f50359eb328b0b9d67451f56fda20b3255f9a':
dsputil: Split off quarterpel bits into their own context
Conflicts:
configure
libavcodec/dsputil.c
libavcodec/h263dec.c
libavcodec/mpegvideo.c
libavcodec/mpegvideo_enc.c
libavcodec/vc1dec.c
libavcodec/vc1dsp.c
libavcodec/x86/dsputil_init.c
libavcodec/x86/qpeldsp.asm
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/h264qpel.h')
| -rw-r--r-- | libavcodec/h264qpel.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libavcodec/h264qpel.h b/libavcodec/h264qpel.h index 041ee7d..d71130d 100644 --- a/libavcodec/h264qpel.h +++ b/libavcodec/h264qpel.h @@ -22,7 +22,7 @@ #ifndef AVCODEC_H264QPEL_H #define AVCODEC_H264QPEL_H -#include "dsputil.h" +#include "qpeldsp.h" typedef struct H264QpelContext { qpel_mc_func put_h264_qpel_pixels_tab[4][16]; |
