diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2012-12-08 14:58:56 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2012-12-08 14:58:56 +0100 |
| commit | 57cee850238488a6088085ae078af17f04f2198a (patch) | |
| tree | 9551a690983609d59e91e3c63ae4b15114eecb34 /libavcodec/parser.c | |
| parent | 7efee140d7d6fe197a73a178314eacd330a8cc77 (diff) | |
| parent | 096abfa15052977eed93f0b5e01afd2d47c53c1f (diff) | |
| download | ffmpeg-57cee850238488a6088085ae078af17f04f2198a.tar.gz | |
Merge commit '096abfa15052977eed93f0b5e01afd2d47c53c1f'
* commit '096abfa15052977eed93f0b5e01afd2d47c53c1f':
parser: fix large overreads
bitstream: add get_bits64() to support reading more than 32 bits at once
arm: detect cpu features at runtime on Linux
Conflicts:
libavcodec/parser.c
libavformat/mpegts.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/parser.c')
| -rw-r--r-- | libavcodec/parser.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/libavcodec/parser.c b/libavcodec/parser.c index 2e204e2c2a..3b4715035a 100644 --- a/libavcodec/parser.c +++ b/libavcodec/parser.c @@ -253,8 +253,9 @@ int ff_combine_frame(ParseContext *pc, int next, const uint8_t **buf, int *buf_s if(!new_buffer) return AVERROR(ENOMEM); pc->buffer = new_buffer; - if(FF_INPUT_BUFFER_PADDING_SIZE > -next) - memcpy(&pc->buffer[pc->index], *buf, next + FF_INPUT_BUFFER_PADDING_SIZE ); + if (next > -FF_INPUT_BUFFER_PADDING_SIZE) + memcpy(&pc->buffer[pc->index], *buf, + next + FF_INPUT_BUFFER_PADDING_SIZE); pc->index = 0; *buf= pc->buffer; } |