From 11f024ef0ab923ed8680fc35a087d576e549c849 Mon Sep 17 00:00:00 2001 From: Anton Khirnov Date: Mon, 6 Apr 2015 21:00:42 +0200 Subject: h264: move freeing the escaped RBSP buffer to free_context() It does not logically belong in free_tables(), since it's not allocated in alloc_tables() and its size has nothing to do with the frame size. --- libavcodec/h264.c | 15 ++++++--------- 1 file changed, 6 insertions(+), 9 deletions(-) (limited to 'libavcodec/h264.c') diff --git a/libavcodec/h264.c b/libavcodec/h264.c index 4a3da24502..0d8ff40e8c 100644 --- a/libavcodec/h264.c +++ b/libavcodec/h264.c @@ -332,7 +332,7 @@ static int decode_rbsp_trailing(H264Context *h, const uint8_t *src) return 0; } -void ff_h264_free_tables(H264Context *h, int free_rbsp) +void ff_h264_free_tables(H264Context *h) { int i; @@ -372,11 +372,6 @@ void ff_h264_free_tables(H264Context *h, int free_rbsp) sl->edge_emu_buffer_allocated = 0; sl->top_borders_allocated[0] = 0; sl->top_borders_allocated[1] = 0; - - if (free_rbsp) { - av_freep(&sl->rbsp_buffer); - sl->rbsp_buffer_size = 0; - } } } @@ -433,7 +428,7 @@ int ff_h264_alloc_tables(H264Context *h) return 0; fail: - ff_h264_free_tables(h, 1); + ff_h264_free_tables(h); return AVERROR(ENOMEM); } @@ -1065,7 +1060,7 @@ static void flush_dpb(AVCodecContext *avctx) h->mb_y = 0; - ff_h264_free_tables(h, 1); + ff_h264_free_tables(h); h->context_initialized = 0; } @@ -1701,7 +1696,7 @@ av_cold void ff_h264_free_context(H264Context *h) { int i; - ff_h264_free_tables(h, 1); // FIXME cleanup init stuff perhaps + ff_h264_free_tables(h); // FIXME cleanup init stuff perhaps if (h->DPB) { for (i = 0; i < H264_MAX_PICTURE_COUNT; i++) @@ -1711,6 +1706,8 @@ av_cold void ff_h264_free_context(H264Context *h) h->cur_pic_ptr = NULL; + for (i = 0; i < h->nb_slice_ctx; i++) + av_freep(&h->slice_ctx[i].rbsp_buffer); av_freep(&h->slice_ctx); h->nb_slice_ctx = 0; -- cgit v1.2.3