diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-03-18 17:53:02 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-03-18 17:54:01 +0100 |
| commit | 73ef12757b9471474bfebda20792448e9bc4e3cc (patch) | |
| tree | deb0a4fb57b5513fb5a90effa7ad940dfb6f3ba5 /libavformat | |
| parent | 0163ad66e124a3ba1984a9e99a9fcdb624a52730 (diff) | |
| download | ffmpeg-73ef12757b9471474bfebda20792448e9bc4e3cc.tar.gz | |
append_packet_chunked: remove outcommented code
our variant works fine and should be better
also remove related unused variable
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavformat')
| -rw-r--r-- | libavformat/utils.c | 9 |
1 files changed, 0 insertions, 9 deletions
diff --git a/libavformat/utils.c b/libavformat/utils.c index 9315bb20f2..5cf3d9cd47 100644 --- a/libavformat/utils.c +++ b/libavformat/utils.c @@ -280,7 +280,6 @@ int ffio_limit(AVIOContext *s, int size) */ static int append_packet_chunked(AVIOContext *s, AVPacket *pkt, int size) { - int64_t chunk_size = size; int orig_pos = pkt->pos; // av_grow_packet might reset pos int orig_size = pkt->size; int ret; @@ -293,13 +292,6 @@ static int append_packet_chunked(AVIOContext *s, AVPacket *pkt, int size) * When the caller requests a lot of data, limit it to the amount left * in file or SANE_CHUNK_SIZE when it is not known */ -#if 0 - if (size > SANE_CHUNK_SIZE) { - int64_t filesize = avio_size(s) - avio_tell(s); - chunk_size = FFMAX(filesize, SANE_CHUNK_SIZE); - } - read_size = FFMIN(size, chunk_size); -#else read_size = size; if (read_size > SANE_CHUNK_SIZE/10) { read_size = ffio_limit(s, read_size); @@ -307,7 +299,6 @@ static int append_packet_chunked(AVIOContext *s, AVPacket *pkt, int size) if (s->maxsize < 0) read_size = FFMIN(read_size, SANE_CHUNK_SIZE); } -#endif ret = av_grow_packet(pkt, read_size); if (ret < 0) |