[FFmpeg-cvslog] h264: proper cleanup in ff_h264_alloc_tables() if DPB alloc fails

Michael Niedermayer git at videolan.org
Fri Dec 5 21:48:56 CET 2014


ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Tue Dec  2 16:47:56 2014 +0000| [d69d787dad77f62c89cbc7ea5d301641f45f36e3] | committer: Vittorio Giovara

h264: proper cleanup in ff_h264_alloc_tables() if DPB alloc fails

CC: libav-devel at libav.org

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=d69d787dad77f62c89cbc7ea5d301641f45f36e3
---

 libavcodec/h264.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/libavcodec/h264.c b/libavcodec/h264.c
index cb29d36..67c7eef 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);



More information about the ffmpeg-cvslog mailing list