diff options
| author | Dustin Brody <libav@parsoma.net> | 2011-08-11 16:57:58 +0400 |
|---|---|---|
| committer | Reinhard Tartler <siretart@tauware.de> | 2011-11-05 16:18:32 +0400 |
| commit | 36c196bca4be68f8ebf04bf2ac9b972d4f084b9f (patch) | |
| tree | 4c4836450ce19ac314aabf5699597a60d7941bb4 /libavcodec | |
| parent | 7b733e4b7fd052170199ae29fa14e1e71ba95077 (diff) | |
h264: notice memory allocation failure
Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
(cherry picked from commit bac3ab13ea6a9dd8853e79ef3eacf51d234c8774)
Signed-off-by: Anton Khirnov <anton@khirnov.net>
(cherry picked from commit 59a22afa0b50b9037133a7bc26bdc5023e7e1df9)
Conflicts:
libavcodec/h264.c
Signed-off-by: Reinhard Tartler <siretart@tauware.de>
Diffstat (limited to 'libavcodec')
| -rw-r--r-- | libavcodec/h264.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/libavcodec/h264.c b/libavcodec/h264.c index e4654f0435..1f045a8be7 100644 --- a/libavcodec/h264.c +++ b/libavcodec/h264.c @@ -1840,7 +1840,10 @@ static int decode_slice_header(H264Context *h, H264Context *h0){ h->prev_interlaced_frame = 1; init_scan_tables(h); - ff_h264_alloc_tables(h); + if (ff_h264_alloc_tables(h) < 0) { + av_log(h->s.avctx, AV_LOG_ERROR, "Could not allocate memory for h264\n"); + return AVERROR(ENOMEM); + } for(i = 1; i < s->avctx->thread_count; i++) { H264Context *c; |