Merge commit 'c1076d8479a6c0ee2e0c4b0e2151df5b0228438e'

* commit 'c1076d8479a6c0ee2e0c4b0e2151df5b0228438e': h264: check one context_init() allocation Conflicts: libavcodec/h264.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
12 years ago · 921c1d4c95
parent d2d8e259fd c1076d8479
commit 921c1d4c95
1 changed files with 5 additions and 1 deletions
--- a/libavcodec/h264.c
+++ b/libavcodec/h264.c
@ -1709,7 +1709,11 @@ static int decode_update_thread_context(AVCodecContext *dst,
            av_log(dst, AV_LOG_ERROR, "Could not allocate memory for h264\n");
            return ret;
        }
-        context_init(h);
+        ret = context_init(h);
+        if (ret < 0) {
+            av_log(dst, AV_LOG_ERROR, "context_init() failed.\n");
+            return ret;
+        }
        }

        for (i = 0; i < 2; i++) {