diff --git a/gst/avi/gstavimux.c b/gst/avi/gstavimux.c
index e5bbfd5f45..0602e412ca 100644
--- a/gst/avi/gstavimux.c
+++ b/gst/avi/gstavimux.c
@@ -1803,6 +1803,10 @@ gst_avi_mux_do_buffer (GstAviMux * avimux, GstAviPad * avipad)
   }
 
   if (avipad->is_video) {
+    /* the suggested buffer size is the max frame size */
+    if (avipad->hdr.bufsize < GST_BUFFER_SIZE (data))
+      avipad->hdr.bufsize = GST_BUFFER_SIZE (data);
+
     avimux->total_frames++;
 
     if (avimux->is_bigfile) {