From: Michael Niedermayer <mich...@niedermayer.cc> encoding changes from 17 to 20 fps
Signed-off-by: Michael Niedermayer <mich...@niedermayer.cc> --- libavcodec/diracdec.c | 18 ++++++++++++------ 1 file changed, 12 insertions(+), 6 deletions(-) diff --git a/libavcodec/diracdec.c b/libavcodec/diracdec.c index bbe6d87..942376b 100644 --- a/libavcodec/diracdec.c +++ b/libavcodec/diracdec.c @@ -491,6 +491,12 @@ static inline int coeff_unpack_golomb(GetBitContext *gb, int qfactor, int qoffse UPDATE_CACHE(re, gb); buf = GET_CACHE(re, gb); + if (buf & 0x80000000) { + LAST_SKIP_BITS(re,gb,1); + CLOSE_READER(re, gb); + return 0; + } + if (buf & 0xAA800000) { buf >>= 32 - 8; SKIP_BITS(re, gb, ff_interleaved_golomb_vlc_len[buf]); @@ -516,12 +522,12 @@ static inline int coeff_unpack_golomb(GetBitContext *gb, int qfactor, int qoffse coeff = ret - 1; } - if (coeff) { - coeff = (coeff * qfactor + qoffset) >> 2; - sign = SHOW_SBITS(re, gb, 1); - LAST_SKIP_BITS(re, gb, 1); - coeff = (coeff ^ sign) - sign; - } + + coeff = (coeff * qfactor + qoffset) >> 2; + sign = SHOW_SBITS(re, gb, 1); + LAST_SKIP_BITS(re, gb, 1); + coeff = (coeff ^ sign) - sign; + CLOSE_READER(re, gb); return coeff; } -- 1.7.9.5 _______________________________________________ ffmpeg-devel mailing list ffmpeg-devel@ffmpeg.org http://ffmpeg.org/mailman/listinfo/ffmpeg-devel