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/h263dec.c | |
| parent | 098d3891be08ca119e20ad7989668ddef83b31ea (diff) | |
| parent | 68f18f03519ae550e25cf12661172641e9f0eaca (diff) | |
| download | ffmpeg-a85311ef841b87ddaacf7c198f422db5c1ac2d60.tar.gz | |
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/h263dec.c')
| -rw-r--r-- | libavcodec/h263dec.c | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/libavcodec/h263dec.c b/libavcodec/h263dec.c index 8f1e4d3c9a..71dc948784 100644 --- a/libavcodec/h263dec.c +++ b/libavcodec/h263dec.c @@ -643,10 +643,7 @@ retry: s->next_p_frame_damaged=0; } - if((s->avctx->flags2 & CODEC_FLAG2_FAST) && s->pict_type==AV_PICTURE_TYPE_B){ - s->me.qpel_put= s->dsp.put_2tap_qpel_pixels_tab; - s->me.qpel_avg= s->dsp.avg_2tap_qpel_pixels_tab; - }else if((!s->no_rounding) || s->pict_type==AV_PICTURE_TYPE_B){ + if((!s->no_rounding) || s->pict_type==AV_PICTURE_TYPE_B){ s->me.qpel_put= s->dsp.put_qpel_pixels_tab; s->me.qpel_avg= s->dsp.avg_qpel_pixels_tab; }else{ |