diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-08-11 10:35:44 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-08-11 10:35:44 +0200 |
| commit | 921c1d4c95a828167342095e77bbacfad25db686 (patch) | |
| tree | 6ecb90b7d76e281dace7574edb7402856deb863a | |
| parent | d2d8e259fd2e5149546431b6c7d1cd3560b7ab97 (diff) | |
| parent | c1076d8479a6c0ee2e0c4b0e2151df5b0228438e (diff) | |
| download | ffmpeg-921c1d4c95a828167342095e77bbacfad25db686.tar.gz | |
Merge commit 'c1076d8479a6c0ee2e0c4b0e2151df5b0228438e'
* commit 'c1076d8479a6c0ee2e0c4b0e2151df5b0228438e':
h264: check one context_init() allocation
Conflicts:
libavcodec/h264.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
| -rw-r--r-- | libavcodec/h264.c | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/libavcodec/h264.c b/libavcodec/h264.c index 33aeaedf6b..d0fa80f806 100644 --- 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++) { |