Browse Source

lavf: add internal AVIOContext.maxsize

This allows simple and generic limiting of allocations used for packets.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit 47572323f2)

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
tags/n0.9.1
Michael Niedermayer 14 years ago
parent
commit
349cca9f12
2 changed files with 15 additions and 1 deletions
  1. +6
    -0
      libavformat/avio.h
  2. +9
    -1
      libavformat/utils.c

+ 6
- 0
libavformat/avio.h View File

@@ -120,6 +120,12 @@ typedef struct {
* A combination of AVIO_SEEKABLE_ flags or 0 when the stream is not seekable.
*/
int seekable;

/**
* max filesize, used to limit allocations
* This field is internal to libavformat and access from outside is not allowed.
*/
int64_t maxsize;
} AVIOContext;

/* unbuffered I/O */


+ 9
- 1
libavformat/utils.c View File

@@ -267,7 +267,15 @@ AVInputFormat *av_find_input_format(const char *short_name)

int av_get_packet(AVIOContext *s, AVPacket *pkt, int size)
{
int ret= av_new_packet(pkt, size);
int ret;

if(s->maxsize>0){
int64_t remaining= s->maxsize - avio_tell(s);
if(remaining>=0)
size= FFMIN(size, remaining);
}

ret= av_new_packet(pkt, size);

if(ret<0)
return ret;


Loading…
Cancel
Save