diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2011-07-23 16:47:10 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2011-07-23 16:47:10 +0200 |
| commit | 5271b857ebc7ddcfa2d0dc6604f55ef43d2bc49e (patch) | |
| tree | 38b5f7b209f392584c6829a0dd1fd84a9b70bec1 /libavcodec/dnxhddec.c | |
| parent | cc0dc50d027b8aca27b07ef5cededde2e9d96d57 (diff) | |
| parent | b4cfb8254eeeb2fc0aa2c0c36a5ede208af47a79 (diff) | |
| download | ffmpeg-5271b857ebc7ddcfa2d0dc6604f55ef43d2bc49e.tar.gz | |
Merge remote-tracking branch 'qatar/master'
* qatar/master:
dnxhddec: avoid a branch in 10-bit decode_dct_block()
H.264: Add optimizations to predict x86 assembly.
riff: Add mpgv MPEG-2 fourcc
add Flash Screen Video 2 decoder
Conflicts:
configure
doc/general.texi
libavcodec/Makefile
libavcodec/allcodecs.c
libavcodec/version.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/dnxhddec.c')
| -rw-r--r-- | libavcodec/dnxhddec.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libavcodec/dnxhddec.c b/libavcodec/dnxhddec.c index a7ad620fd8..bfc4de645c 100644 --- a/libavcodec/dnxhddec.c +++ b/libavcodec/dnxhddec.c @@ -246,7 +246,7 @@ static av_always_inline void dnxhd_decode_dct_block(DNXHDContext *ctx, //av_log(ctx->avctx, AV_LOG_DEBUG, "j %d\n", j); //av_log(ctx->avctx, AV_LOG_DEBUG, "level %d, weight %d\n", level, weight_matrix[i]); level = (2*level+1) * qscale * weight_matrix[i]; - if (weight_matrix[i] != level_bias) + if (level_bias < 32 || weight_matrix[i] != level_bias) level += level_bias; level >>= level_shift; |