diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2006-01-08 01:50:34 +0000 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2006-01-08 01:50:34 +0000 |
| commit | 80e44bc3bf31ead00fe3df3d1bf2a197cd0856d8 (patch) | |
| tree | c0dd5ffec14e20008aaf097d39837258df28e078 /libavcodec/dsputil.h | |
| parent | 51bb91cb2412da024a9dd0ebce3c22f52eee7ec9 (diff) | |
| download | ffmpeg-80e44bc3bf31ead00fe3df3d1bf2a197cd0856d8.tar.gz | |
use h264 MC functions for 2xX Xx2 blocks in snow too
Originally committed as revision 4824 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'libavcodec/dsputil.h')
| -rw-r--r-- | libavcodec/dsputil.h | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/libavcodec/dsputil.h b/libavcodec/dsputil.h index 969fdbcb69..fdcea72129 100644 --- a/libavcodec/dsputil.h +++ b/libavcodec/dsputil.h @@ -253,8 +253,8 @@ typedef struct DSPContext { h264_chroma_mc_func put_h264_chroma_pixels_tab[3]; h264_chroma_mc_func avg_h264_chroma_pixels_tab[3]; - qpel_mc_func put_h264_qpel_pixels_tab[3][16]; - qpel_mc_func avg_h264_qpel_pixels_tab[3][16]; + qpel_mc_func put_h264_qpel_pixels_tab[4][16]; + qpel_mc_func avg_h264_qpel_pixels_tab[4][16]; h264_weight_func weight_h264_pixels_tab[10]; h264_biweight_func biweight_h264_pixels_tab[10]; @@ -510,6 +510,7 @@ struct unaligned_16 { uint16_t l; } __attribute__((packed)); #define LD32(a) (((const struct unaligned_32 *) (a))->l) #define LD64(a) (((const struct unaligned_64 *) (a))->l) +#define ST16(a, b) (((struct unaligned_16 *) (a))->l) = (b) #define ST32(a, b) (((struct unaligned_32 *) (a))->l) = (b) #else /* __GNUC__ */ |