[FFmpeg-cvslog] append_packet_chunked: remove outcommented code

Michael Niedermayer git at videolan.org
Mon Mar 18 18:01:26 CET 2013


ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Mon Mar 18 17:53:02 2013 +0100| [73ef12757b9471474bfebda20792448e9bc4e3cc] | committer: Michael Niedermayer

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 at gmx.at>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=73ef12757b9471474bfebda20792448e9bc4e3cc
---

 libavformat/utils.c |    9 ---------
 1 file changed, 9 deletions(-)

diff --git a/libavformat/utils.c b/libavformat/utils.c
index 9315bb2..5cf3d9c 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)



More information about the ffmpeg-cvslog mailing list