diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-01-21 13:38:57 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-01-21 13:38:57 +0100 |
| commit | a85311ef841b87ddaacf7c198f422db5c1ac2d60 (patch) | |
| tree | 0c39d27f14ae7168bbc36f57d049a964c6e63a12 /libavcodec/h264.c | |
| parent | 098d3891be08ca119e20ad7989668ddef83b31ea (diff) | |
| parent | 68f18f03519ae550e25cf12661172641e9f0eaca (diff) | |
Merge commit '68f18f03519ae550e25cf12661172641e9f0eaca'
* commit '68f18f03519ae550e25cf12661172641e9f0eaca':
videodsp_armv5te: remove #if HAVE_ARMV5TE_EXTERNAL
dsputil: drop non-compliant "fast" qpel mc functions
get_bits: change the failure condition in init_get_bits
Conflicts:
libavcodec/get_bits.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>
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); |