Merge commit '11f024ef0ab923ed8680fc35a087d576e549c849'

* commit '11f024ef0ab923ed8680fc35a087d576e549c849':
  h264: move freeing the escaped RBSP buffer to free_context()

Merged-by: Michael Niedermayer <michaelni@gmx.at>

1 files changed, 2 insertions, 2 deletions

diff --git a/libavcodec/h264_slice.c b/libavcodec/h264_slice.c
index 7551df7da5..24f5bd43d6 100644
--- a/libavcodec/h264_slice.c
+++ b/libavcodec/h264_slice.c
@@ -1090,7 +1090,7 @@ static int h264_slice_header_init(H264Context *h, int reinit)
     }
 
     if (reinit)
-        ff_h264_free_tables(h, 0);
+        ff_h264_free_tables(h);
     h->first_field           = 0;
     h->prev_interlaced_frame = 1;
 
@@ -1170,7 +1170,7 @@ static int h264_slice_header_init(H264Context *h, int reinit)
 
     return 0;
 fail:
-    ff_h264_free_tables(h, 0);
+    ff_h264_free_tables(h);
     h->context_initialized = 0;
     return ret;
 }