diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2011-06-27 03:32:45 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2011-06-27 03:32:45 +0200 |
| commit | f211d9d8391c15e7408b8468dd7430eae2514544 (patch) | |
| tree | f432096b52ab7971a7ca7fb05db18dcc1cfcb3a5 /libavcodec/h264.c | |
| parent | 721719dd0c0321b47500fa49b649c78422e910aa (diff) | |
| parent | 659aa20e56de03b461afdaa6ae7e5d4be6e0d5fc (diff) | |
| download | ffmpeg-f211d9d8391c15e7408b8468dd7430eae2514544.tar.gz | |
Merge remote-tracking branch 'qatar/master'
* qatar/master:
build: improve rules for test programs
build: factor out the .c and .S compile commands as a macro
swscale: remove unused xInc/srcW arguments from hScale().
H.264: disable 2tap qpel with CODEC_FLAG2_FAST and >8-bit
H.264: make filter_mb_fast support 4:4:4
mpeg4videoenc: Remove disabled variant of mpeg4_encode_block().
configure: allow post-fixed cpu strings for athlon64, k8, and opteron when setting the -march flag.
Move some variable declarations below the proper #ifdefs.
Conflicts:
Makefile
ffplay.c
libswscale/swscale.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
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 dd9f425c3b..8ecf9b4dbd 100644 --- a/libavcodec/h264.c +++ b/libavcodec/h264.c @@ -2488,7 +2488,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{ |