highperfocused/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

lavf: split out ffio_limit()

Browse Source 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer 2011-12-19 11:46:34 +01:00
parent f85334f58e
commit e39eeb10d1
2 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
libavformat/avio_internal.h
View File

@ -71,6 +71,8 @@ uint64_t ffio_read_varlen(AVIOContext *bc);
/** @warning must be called before any I/O */ /** @warning must be called before any I/O */
int ffio_set_buf_size(AVIOContext *s, int buf_size); int ffio_set_buf_size(AVIOContext *s, int buf_size);
int ffio_limit(AVIOContext *s, int size);
void ffio_init_checksum(AVIOContext *s, void ffio_init_checksum(AVIOContext *s,
unsigned long (*update_checksum)(unsigned long c, const uint8_t *p, unsigned int len), unsigned long (*update_checksum)(unsigned long c, const uint8_t *p, unsigned int len),
unsigned long checksum); unsigned long checksum);

12
libavformat/utils.c
View File

@ -264,11 +264,8 @@ AVInputFormat *av_find_input_format(const char *short_name)
return NULL; return NULL;
} }
int ffio_limit(AVIOContext *s, int size)
int av_get_packet(AVIOContext *s, AVPacket *pkt, int size)
{ {
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 < size){ if(remaining < size){
@ -283,6 +280,13 @@ int av_get_packet(AVIOContext *s, AVPacket *pkt, int size)
size= remaining+1; size= remaining+1;
} }
} }
return size;
}
int av_get_packet(AVIOContext *s, AVPacket *pkt, int size)
{
int ret;
size= ffio_limit(s, size);
ret= av_new_packet(pkt, size); ret= av_new_packet(pkt, size);