diff --git a/libavcodec/common.c b/libavcodec/common.c
index fb73c7eb5c..b3436eb81c 100644
--- a/libavcodec/common.c
+++ b/libavcodec/common.c
@@ -157,6 +157,7 @@ void jput_bits(PutBitContext *s, int n, unsigned int value)
 void jflush_put_bits(PutBitContext *s)
 {
     unsigned int b;
+    s->bit_buf |= ~1U >> s->bit_cnt; /* set all the unused bits to one */
 
     while (s->bit_cnt > 0) {
         b = s->bit_buf >> 24;