diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2011-12-25 04:48:26 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2012-01-03 22:32:28 +0100 |
| commit | 0231a68ecd06cc894cc3e292a3c4cc015e40504a (patch) | |
| tree | 492774c08a5949d640fd3ef08ebb83af8bd1cfd2 /libavformat/utils.c | |
| parent | 7c67d9c6fb6d2752c92ad309303e9557cffa0094 (diff) | |
| download | ffmpeg-0231a68ecd06cc894cc3e292a3c4cc015e40504a.tar.gz | |
avio: Fix ffio_limit() when due to seeking past the end less than 0 bytes remain.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit 27d323577c19af218f8a5ac33364f213b623a023)
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavformat/utils.c')
| -rw-r--r-- | libavformat/utils.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/libavformat/utils.c b/libavformat/utils.c index 5ed85dc857..b59a69228e 100644 --- a/libavformat/utils.c +++ b/libavformat/utils.c @@ -273,9 +273,10 @@ int ffio_limit(AVIOContext *s, int size) if(!s->maxsize || s->maxsize<newsize) s->maxsize= newsize; remaining= s->maxsize - avio_tell(s); + remaining= FFMAX(remaining, 0); } - if(s->maxsize>=0 && remaining>=0 && remaining+1 < size){ + if(s->maxsize>=0 && remaining+1 < size){ av_log(0, AV_LOG_ERROR, "Truncating packet of size %d to %"PRId64"\n", size, remaining+1); size= remaining+1; } |