Merge remote-tracking branch 'qatar/master'

[ffmpeg] / libavcodec / put_bits.h

diff --git a/libavcodec/put_bits.h b/libavcodec/put_bits.h
index a3fc5f16f1b6e192943dce3702ca040c82934c40..7384fba4e498fcf07a8e1d4d0bcfdee5a5d4ecf5 100644 (file)
--- a/libavcodec/put_bits.h
+++ b/libavcodec/put_bits.h
@@ -78,7 +78,8 @@ static inline int put_bits_count(PutBitContext *s)
 static inline void flush_put_bits(PutBitContext *s)
 {
 #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 */