[FFmpeg-cvslog] avcodec/h264: do proper cleanup in ff_h264_alloc_tables() in case DPB alloc fails

Michael Niedermayer git at videolan.org
Sat Aug 23 05:02:59 CEST 2014


ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Thu Aug 21 16:15:16 2014 +0200| [949057c95879e601bd33c8a42eeca39ced2b9a2d] | committer: Michael Niedermayer

avcodec/h264: do proper cleanup in ff_h264_alloc_tables() in case DPB alloc fails

Signed-off-by: Michael Niedermayer <michaelni at gmx.at>

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

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

diff --git a/libavcodec/h264.c b/libavcodec/h264.c
index cfe627f..ed1365d 100644
--- a/libavcodec/h264.c
+++ b/libavcodec/h264.c
@@ -473,7 +473,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