diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-04-07 15:42:45 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-04-07 15:42:45 +0200 |
| commit | e9d5a6f1c5b65319400a45446ae6523a2296de73 (patch) | |
| tree | 11110d207fd762b9c52233cde9aba0b32090d0b1 /libavformat | |
| parent | 0af8ed29e4a756c3e207ac65f479c23ca8ed025b (diff) | |
| parent | 327ff82bac3081d918dceb4931c77e25d0a1480d (diff) | |
| download | ffmpeg-e9d5a6f1c5b65319400a45446ae6523a2296de73.tar.gz | |
Merge commit '327ff82bac3081d918dceb4931c77e25d0a1480d' into release/0.10
* commit '327ff82bac3081d918dceb4931c77e25d0a1480d':
msrle: convert MS RLE decoding function to bytestream2.
Update Changelog for the 0.8.6 Release
wmaprodec: require block_align to be set.
ivi_common: do not call MC for intra frames when dc_transform is unset
roqvideodec: fix a potential infinite loop in roqvideo_decode_frame().
Revert "libmp3lame: use the correct remaining buffer size when flushing"
lzo: fix overflow checking in copy_backptr()
flacdec: simplify bounds checking in flac_probe()
atrac3: avoid oversized shifting in decode_bytes()
avconv: skip attached files when selecting streams to read from.
lavf: fix arithmetic overflows in avformat_seek_file()
Conflicts:
Changelog
avconv.c
libavcodec/libmp3lame.c
libavcodec/msrledec.c
libavformat/utils.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavformat')
| -rw-r--r-- | libavformat/flacdec.c | 8 | ||||
| -rw-r--r-- | libavformat/utils.c | 2 |
2 files changed, 4 insertions, 6 deletions
diff --git a/libavformat/flacdec.c b/libavformat/flacdec.c index 070f9af3f6..6af54712d9 100644 --- a/libavformat/flacdec.c +++ b/libavformat/flacdec.c @@ -143,11 +143,9 @@ static int flac_read_header(AVFormatContext *s, static int flac_probe(AVProbeData *p) { - uint8_t *bufptr = p->buf; - uint8_t *end = p->buf + p->buf_size; - - if(bufptr > end-4 || memcmp(bufptr, "fLaC", 4)) return 0; - else return AVPROBE_SCORE_MAX/2; + if (p->buf_size < 4 || memcmp(p->buf, "fLaC", 4)) + return 0; + return AVPROBE_SCORE_MAX/2; } AVInputFormat ff_flac_demuxer = { diff --git a/libavformat/utils.c b/libavformat/utils.c index 7e807c2333..33967df0b2 100644 --- a/libavformat/utils.c +++ b/libavformat/utils.c @@ -1948,7 +1948,7 @@ int avformat_seek_file(AVFormatContext *s, int stream_index, int64_t min_ts, int //Note the old has somewat different sematics AV_NOWARN_DEPRECATED( if(s->iformat->read_seek || 1) - return av_seek_frame(s, stream_index, ts, flags | (ts - min_ts > (uint64_t)(max_ts - ts) ? AVSEEK_FLAG_BACKWARD : 0)); + return av_seek_frame(s, stream_index, ts, flags | ((uint64_t)ts - min_ts > (uint64_t)max_ts - ts ? AVSEEK_FLAG_BACKWARD : 0)); ) // try some generic seek like seek_frame_generic() but with new ts semantics |