diff options
| author | Mans Rullgard <mans@mansr.com> | 2013-01-18 23:37:41 +0100 |
|---|---|---|
| committer | Diego Biurrun <diego@biurrun.de> | 2013-01-20 14:50:42 +0100 |
| commit | 0b711ca3f3e5643bac9ddef775f2b16187b66835 (patch) | |
| tree | b8de88f89476a5f03101731bb3dcdb39ffd71d99 /libavcodec/h264.c | |
| parent | 4603ec85ed620e585fc6e2e072c99858ed421855 (diff) | |
| download | ffmpeg-0b711ca3f3e5643bac9ddef775f2b16187b66835.tar.gz | |
dsputil: drop non-compliant "fast" qpel mc functions
Signed-off-by: Diego Biurrun <diego@biurrun.de>
Diffstat (limited to 'libavcodec/h264.c')
| -rw-r--r-- | libavcodec/h264.c | 11 |
1 files changed, 2 insertions, 9 deletions
diff --git a/libavcodec/h264.c b/libavcodec/h264.c index 5b7b18c7be..2e2b272714 100644 --- a/libavcodec/h264.c +++ b/libavcodec/h264.c @@ -2593,15 +2593,8 @@ static int decode_slice_header(H264Context *h, H264Context *h0) int last_pic_structure, last_pic_droppable; int needs_reinit = 0; - /* FIXME: 2tap qpel isn't implemented for high bit depth. */ - if ((s->avctx->flags2 & CODEC_FLAG2_FAST) && - !h->nal_ref_idc && !h->pixel_shift) { - s->me.qpel_put = s->dsp.put_2tap_qpel_pixels_tab; - s->me.qpel_avg = s->dsp.avg_2tap_qpel_pixels_tab; - } else { - s->me.qpel_put = s->dsp.put_h264_qpel_pixels_tab; - s->me.qpel_avg = s->dsp.avg_h264_qpel_pixels_tab; - } + s->me.qpel_put = s->dsp.put_h264_qpel_pixels_tab; + s->me.qpel_avg = s->dsp.avg_h264_qpel_pixels_tab; first_mb_in_slice = get_ue_golomb(&s->gb); |