RepoMirrors/ffmpeg
1
0
Fork 0
mirror of https://git.ffmpeg.org/ffmpeg.git synced 2025-03-24 20:12:51 +00:00
Code Issues Projects Releases Wiki Activity

append_packet_chunked: remove outcommented code

Browse Source 
our variant works fine and should be better
also remove related unused variable

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer 2013-03-18 17:53:02 +01:00
parent 0163ad66e1
commit 73ef12757b
1 changed files with 0 additions and 9 deletions

9
libavformat/utils.c
View File

@ -280,7 +280,6 @@ int ffio_limit(AVIOContext *s, int size)
*/ */
static int append_packet_chunked(AVIOContext *s, AVPacket *pkt, 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_pos = pkt->pos; // av_grow_packet might reset pos
int orig_size = pkt->size; int orig_size = pkt->size;
int ret; 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 * 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 * 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; read_size = size;
if (read_size > SANE_CHUNK_SIZE/10) { if (read_size > SANE_CHUNK_SIZE/10) {
read_size = ffio_limit(s, read_size); 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) if (s->maxsize < 0)
read_size = FFMIN(read_size, SANE_CHUNK_SIZE); read_size = FFMIN(read_size, SANE_CHUNK_SIZE);
} }
#endif
ret = av_grow_packet(pkt, read_size); ret = av_grow_packet(pkt, read_size);
if (ret < 0) if (ret < 0)