diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2012-04-28 20:45:06 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2012-04-28 20:45:06 +0200 |
| commit | 9d7c1b4cf36737bde226d0f7bb4e271e61e4e8a6 (patch) | |
| tree | 07577504efcb323108e1fcb6d76499a863386589 /libavcodec | |
| parent | c31be45e144a5f4748c9b9d5b8802f254550a471 (diff) | |
| parent | 9b9df1cdff149db5bbe6726b236934c5b5fbe21d (diff) | |
| download | ffmpeg-9d7c1b4cf36737bde226d0f7bb4e271e61e4e8a6.tar.gz | |
Merge remote-tracking branch 'qatar/master'
* qatar/master:
h264: new assembly version of get_cabac for x86_64 with PIC
h264: use one table instead of several for cabac functions
h264: (trivial) remove unneeded macro argument in x86/cabac.h
libschroedingerdec: check malloc
segment: reorder seg_write_header allocation
avio: make avio_close(NULL) a no-op
mov: Parse EC3SpecificBox (dec3 atom).
Conflicts:
libavcodec/cabac.c
libavcodec/x86/cabac.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec')
| -rw-r--r-- | libavcodec/libschroedingerdec.c | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/libavcodec/libschroedingerdec.c b/libavcodec/libschroedingerdec.c index 3c52040bce..bd20c40d15 100644 --- a/libavcodec/libschroedingerdec.c +++ b/libavcodec/libschroedingerdec.c @@ -106,6 +106,11 @@ static SchroBuffer *FindNextSchroParseUnit(SchroParseUnitContext *parse_ctx) return NULL; in_buf = av_malloc(next_pu_offset); + if (!in_buf) { + av_log(parse_ctx, AV_LOG_ERROR, "Unable to allocate input buffer\n"); + return NULL; + } + memcpy(in_buf, parse_ctx->buf, next_pu_offset); enc_buf = schro_buffer_new_with_data(in_buf, next_pu_offset); enc_buf->free = libschroedinger_decode_buffer_free; |