diff --git a/libavcodec/h264.c b/libavcodec/h264.c
index 5e03e479df..daf6c3ea77 100644
--- a/libavcodec/h264.c
+++ b/libavcodec/h264.c
@@ -1999,6 +1999,8 @@ static void free_tables(H264Context *h){
         av_freep(&hx->s.obmc_scratchpad);
         av_freep(&hx->rbsp_buffer[1]);
         av_freep(&hx->rbsp_buffer[0]);
+        hx->rbsp_buffer_size[0] = 0;
+        hx->rbsp_buffer_size[1] = 0;
         if (i) av_freep(&h->thread_context[i]);
     }
 }