diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-01-14 21:53:12 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-01-14 21:54:11 +0100 |
| commit | d938a013af7607485eac4d0af1d8f5d08bac778e (patch) | |
| tree | b164ec207870350d068a884578264e30b1b3dd62 /libavformat/mxfdec.c | |
| parent | 1171ad647ebfc03b65fd3a02720edb7f20c00169 (diff) | |
| parent | aa0cb16c15a5b30f78542f18e3fa65de005cf084 (diff) | |
Merge commit 'aa0cb16c15a5b30f78542f18e3fa65de005cf084'
* commit 'aa0cb16c15a5b30f78542f18e3fa65de005cf084':
mxf: Fix off by one error in d10 aes3 decoding
Conflicts:
libavformat/mxfdec.c
See: 3be02afb56f2a485fcdc747b6c2f77ed03adc6e5
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavformat/mxfdec.c')
| -rw-r--r-- | libavformat/mxfdec.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libavformat/mxfdec.c b/libavformat/mxfdec.c index 4af754ca33..d6eb7d1899 100644 --- a/libavformat/mxfdec.c +++ b/libavformat/mxfdec.c @@ -331,7 +331,7 @@ static int mxf_get_d10_aes3_packet(AVIOContext *pb, AVStream *st, AVPacket *pkt, data_ptr = pkt->data; end_ptr = pkt->data + length; buf_ptr = pkt->data + 4; /* skip SMPTE 331M header */ - for (; buf_ptr + st->codec->channels*4 <= end_ptr; ) { + for (; end_ptr - buf_ptr >= st->codec->channels * 4; ) { for (i = 0; i < st->codec->channels; i++) { uint32_t sample = bytestream_get_le32(&buf_ptr); if (st->codec->bits_per_coded_sample == 24) |