diff options
| author | Jason Garrett-Glaser <jason@x264.com> | 2011-06-26 00:21:54 -0700 |
|---|---|---|
| committer | Reinhard Tartler <siretart@tauware.de> | 2011-06-27 08:39:30 +0200 |
| commit | e54fd33848355202c03edb3ebfcdb53b1d71c2ce (patch) | |
| tree | 10f9b47c8b6f10d08157a2fbbe69db7c18bd6587 /libavcodec/h264.c | |
| parent | 9b69efc02b6f34fbe50512d4d108ec5559ebb9ec (diff) | |
| download | ffmpeg-e54fd33848355202c03edb3ebfcdb53b1d71c2ce.tar.gz | |
H.264: disable 2tap qpel with CODEC_FLAG2_FAST and >8-bit
2tap qpel isn't implemented yet for high bit depth, so it just breaks decoding.
(cherry picked from commit 9a0dda8b3ab07fa7be60335715a6c350c907a7b8)
Signed-off-by: Reinhard Tartler <siretart@tauware.de>
Diffstat (limited to 'libavcodec/h264.c')
| -rw-r--r-- | libavcodec/h264.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/libavcodec/h264.c b/libavcodec/h264.c index 6bee7c39b0..2c000a3420 100644 --- a/libavcodec/h264.c +++ b/libavcodec/h264.c @@ -2485,7 +2485,8 @@ static int decode_slice_header(H264Context *h, H264Context *h0){ s->dropable= h->nal_ref_idc == 0; - if((s->avctx->flags2 & CODEC_FLAG2_FAST) && !h->nal_ref_idc){ + /* 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{ |