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/snow.c | |
| parent | d35899ccce39e77a3f7fb667bdfc710c605d03a4 (diff) | |
| parent | 368f50359eb328b0b9d67451f56fda20b3255f9a (diff) | |
| download | ffmpeg-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/snow.c')
| -rw-r--r-- | libavcodec/snow.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/libavcodec/snow.c b/libavcodec/snow.c index 3961e67870..3a825bd34c 100644 --- a/libavcodec/snow.c +++ b/libavcodec/snow.c @@ -411,11 +411,11 @@ av_cold int ff_snow_common_init(AVCodecContext *avctx){ ff_h264qpel_init(&s->h264qpel, 8); #define mcf(dx,dy)\ - s->dsp.put_qpel_pixels_tab [0][dy+dx/4]=\ - s->dsp.put_no_rnd_qpel_pixels_tab[0][dy+dx/4]=\ + s->qdsp.put_qpel_pixels_tab [0][dy+dx/4]=\ + s->qdsp.put_no_rnd_qpel_pixels_tab[0][dy+dx/4]=\ s->h264qpel.put_h264_qpel_pixels_tab[0][dy+dx/4];\ - s->dsp.put_qpel_pixels_tab [1][dy+dx/4]=\ - s->dsp.put_no_rnd_qpel_pixels_tab[1][dy+dx/4]=\ + s->qdsp.put_qpel_pixels_tab [1][dy+dx/4]=\ + s->qdsp.put_no_rnd_qpel_pixels_tab[1][dy+dx/4]=\ s->h264qpel.put_h264_qpel_pixels_tab[1][dy+dx/4]; mcf( 0, 0) |