From d69d787dad77f62c89cbc7ea5d301641f45f36e3 Mon Sep 17 00:00:00 2001
From: Michael Niedermayer <michaelni@gmx.at>
Date: Tue, 2 Dec 2014 16:47:56 +0000
Subject: [PATCH] h264: proper cleanup in ff_h264_alloc_tables() if DPB alloc
fails
CC: libav-devel@libav.org
---
libavcodec/h264.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/libavcodec/h264.c b/libavcodec/h264.c
index cb29d3621b8..67c7eef1b5a 100644
--- a/libavcodec/h264.c
+++ b/libavcodec/h264.c
@@ -449,7 +449,7 @@ int ff_h264_alloc_tables(H264Context *h)
if (!h->DPB) {
h->DPB = av_mallocz_array(H264_MAX_PICTURE_COUNT, sizeof(*h->DPB));
if (!h->DPB)
- return AVERROR(ENOMEM);
+ goto fail;
for (i = 0; i < H264_MAX_PICTURE_COUNT; i++)
av_frame_unref(&h->DPB[i].f);
av_frame_unref(&h->cur_pic.f);
--
GitLab