[FFmpeg-cvslog] H.264: disable 2tap qpel with CODEC_FLAG2_FAST and >8-bit

[Jason Garrett-Glaser]

ffmpeg | branch: release/0.8 | Jason Garrett-Glaser <jason at x264.com> | Sun Jun 26 00:21:54 2011 -0700| [e54fd33848355202c03edb3ebfcdb53b1d71c2ce] | committer: Reinhard Tartler

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 at tauware.de>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=e54fd33848355202c03edb3ebfcdb53b1d71c2ce
---

 libavcodec/h264.c |    3 ++-
 1 files changed, 2 insertions(+), 1 deletions(-)

diff --git a/libavcodec/h264.c b/libavcodec/h264.c
index 6bee7c3..2c000a3 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{