[FFmpeg-cvslog] put_bits: fix invalid shift by 32 in flush_put_bits()
Mans Rullgard
git at videolan.org
Fri Nov 4 20:49:19 CET 2011
ffmpeg | branch: release/0.7 | Mans Rullgard <mans at mansr.com> | Sat Oct 8 02:09:42 2011 +0100| [4c5cdb493c25a0ffb05022e7afa001725e0adc62] | committer: Michael Niedermayer
put_bits: fix invalid shift by 32 in flush_put_bits()
If flush_put_bits() is called when the 32-bit buffer is empty,
e.g. after writing a multiple of 32 bits, and invalid shift by
32 is performed. Since flush_put_bits() is called infrequently,
this additional check should have negligible performance impact.
Signed-off-by: Mans Rullgard <mans at mansr.com>
(cherry picked from commit ac6eab1496aad6f8b09deabbef4fe5fd829e142d)
Signed-off-by: Michael Niedermayer <michaelni at gmx.at>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=4c5cdb493c25a0ffb05022e7afa001725e0adc62
---
libavcodec/put_bits.h | 3 ++-
1 files changed, 2 insertions(+), 1 deletions(-)
diff --git a/libavcodec/put_bits.h b/libavcodec/put_bits.h
index 7901691..ccd2565 100644
--- a/libavcodec/put_bits.h
+++ b/libavcodec/put_bits.h
@@ -100,7 +100,8 @@ static inline void flush_put_bits(PutBitContext *s)
align_put_bits(s);
#else
#ifndef BITSTREAM_WRITER_LE
- s->bit_buf<<= s->bit_left;
+ if (s->bit_left < 32)
+ s->bit_buf<<= s->bit_left;
#endif
while (s->bit_left < 32) {
/* XXX: should test end of buffer */
More information about the ffmpeg-cvslog
mailing list