[FFmpeg-cvslog] avformat/aviobuf: Only downscale the buffer once it has been used

Michael Niedermayer git at videolan.org
Fri May 19 22:16:13 EEST 2017


ffmpeg | branch: master | Michael Niedermayer <michael at niedermayer.cc> | Fri May 19 20:52:44 2017 +0200| [7383a835e47cd8915ff9cdd693e06716dbae3b3a] | committer: Michael Niedermayer

avformat/aviobuf: Only downscale the buffer once it has been used

The code mistook the first iteration sometimes as the end

Signed-off-by: Michael Niedermayer <michael at niedermayer.cc>

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

 libavformat/aviobuf.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/libavformat/aviobuf.c b/libavformat/aviobuf.c
index 0a7c39eacd..1667e9f08b 100644
--- a/libavformat/aviobuf.c
+++ b/libavformat/aviobuf.c
@@ -542,7 +542,7 @@ static void fill_buffer(AVIOContext *s)
 
     /* make buffer smaller in case it ended up large after probing */
     if (s->read_packet && s->orig_buffer_size && s->buffer_size > s->orig_buffer_size) {
-        if (dst == s->buffer) {
+        if (dst == s->buffer && s->buf_ptr != dst) {
             int ret = ffio_set_buf_size(s, s->orig_buffer_size);
             if (ret < 0)
                 av_log(s, AV_LOG_WARNING, "Failed to decrease buffer size\n");



More information about the ffmpeg-cvslog mailing list