diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2011-11-09 02:58:59 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2011-11-09 02:59:49 +0100 |
| commit | 4354788a893d3633cb9f94932b4c075377a4b324 (patch) | |
| tree | b72774c0284514532dcebd447fc637cb5e573a60 /libavcodec/indeo3.c | |
| parent | 0827222b9cecc3bb07b07059716b81f644db9dcc (diff) | |
| parent | f38f3b88a5a74d0573dc299a512a87f6d579323b (diff) | |
| download | ffmpeg-streaming-4354788a893d3633cb9f94932b4c075377a4b324.zip ffmpeg-streaming-4354788a893d3633cb9f94932b4c075377a4b324.tar.gz | |
Merge remote-tracking branch 'qatar/master'
* qatar/master:
tls: Use ERR_get_error() in do_tls_poll
indeo3: Fix a fencepost error.
mxfdec: Fix comparison of unsigned expression < 0.
mpegts: set stream id on just created stream, not an unrelated variable
ra288: return error if input buffer is too small
ra288: utilize DSPContext.vector_fmul()
ra288: use memcpy() to copy decoded samples to output
mace: only calculate output buffer size once
Remove redundant filename self-references inside files.
indeo3data: add missing config.h #include for HAVE_BIGENDIAN
x86: drop pointless ARCH_X86 #ifdef from files in x86 subdirectory
avplay: reset rdft when closing stream.
doc/git-howto: expand format-patch and send-email notes.
lavf: expand doxy for some AVFormatContext fields.
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/indeo3.c')
| -rw-r--r-- | libavcodec/indeo3.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libavcodec/indeo3.c b/libavcodec/indeo3.c index 6d3c3cc..a5146e8 100644 --- a/libavcodec/indeo3.c +++ b/libavcodec/indeo3.c @@ -444,7 +444,7 @@ static int decode_cell_data(Cell *cell, uint8_t *block, uint8_t *ref_block, BUFFER_PRECHECK; dyad1 = bytestream_get_byte(data_ptr); dyad2 = code; - if (dyad1 > delta_tab->num_dyads || dyad1 >= 248) + if (dyad1 >= delta_tab->num_dyads || dyad1 >= 248) return IV3_BAD_DATA; } else { /* process QUADS */ |
