generic-library/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

lavf: Update AVIOContext.maxsize when hitting the end.

Browse Source 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer 2011-12-16 15:40:21 +01:00
parent 39f59a8da7
commit 559ae20dda
1 changed files with 10 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
libavformat/utils.c
View File

@ -269,10 +269,17 @@ int av_get_packet(AVIOContext *s, AVPacket *pkt, int size)
{ {
int ret; int ret;
if(s->maxsize>0){ if(s->maxsize>=0){
int64_t remaining= s->maxsize - avio_tell(s); int64_t remaining= s->maxsize - avio_tell(s);
if(remaining>=0) if(remaining < size){
size= FFMIN(size, remaining); int64_t newsize= avio_size(s);
if(!s->maxsize || s->maxsize<newsize)
s->maxsize= newsize;
remaining= s->maxsize - avio_tell(s);
}
if(s->maxsize>=0 && remaining>=0)
size= FFMIN(size, remaining+1);
} }
ret= av_new_packet(pkt, size); ret= av_new_packet(pkt, size);