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/h263dec.c | |
| parent | d35899ccce39e77a3f7fb667bdfc710c605d03a4 (diff) | |
| parent | 368f50359eb328b0b9d67451f56fda20b3255f9a (diff) | |
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/h263dec.c')
| -rw-r--r-- | libavcodec/h263dec.c | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/libavcodec/h263dec.c b/libavcodec/h263dec.c index 792c3ed365..5186042ab0 100644 --- a/libavcodec/h263dec.c +++ b/libavcodec/h263dec.c @@ -38,6 +38,7 @@ #include "mpeg4video_parser.h" #include "mpegvideo.h" #include "msmpeg4.h" +#include "qpeldsp.h" #include "vdpau_internal.h" #include "thread.h" @@ -124,6 +125,7 @@ av_cold int ff_h263_decode_init(AVCodecContext *avctx) return ret; ff_h263dsp_init(&s->h263dsp); + ff_qpeldsp_init(&s->qdsp); ff_h263_decode_init_vlc(); return 0; @@ -556,11 +558,11 @@ retry: } if ((!s->no_rounding) || s->pict_type == AV_PICTURE_TYPE_B) { - s->me.qpel_put = s->dsp.put_qpel_pixels_tab; - s->me.qpel_avg = s->dsp.avg_qpel_pixels_tab; + s->me.qpel_put = s->qdsp.put_qpel_pixels_tab; + s->me.qpel_avg = s->qdsp.avg_qpel_pixels_tab; } else { - s->me.qpel_put = s->dsp.put_no_rnd_qpel_pixels_tab; - s->me.qpel_avg = s->dsp.avg_qpel_pixels_tab; + s->me.qpel_put = s->qdsp.put_no_rnd_qpel_pixels_tab; + s->me.qpel_avg = s->qdsp.avg_qpel_pixels_tab; } if ((ret = ff_MPV_frame_start(s, avctx)) < 0) |