diff --git a/libavcodec/golomb.h b/libavcodec/golomb.h
index 9e0a50a1ce..9bf7aec466 100644
--- a/libavcodec/golomb.h
+++ b/libavcodec/golomb.h
@@ -445,6 +445,10 @@ static inline void set_ur_golomb_jpegls(PutBitContext *pb, int i, int k, int lim
         if(k)
             put_bits(pb, k, i&((1<<k)-1));
     }else{
+        while(limit > 31) {
+            put_bits(pb, 31, 0);
+            limit -= 31;
+        }
         put_bits(pb, limit  , 1);
         put_bits(pb, esc_len, i - 1);
     }