diff options
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 87ad03f2c2..34d16baec8 100644 --- a/libavcodec/h264.c +++ b/libavcodec/h264.c @@ -2666,15 +2666,8 @@ static int decode_slice_header(H264Context *h, H264Context *h0) int must_reinit; 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_long(&s->gb); |