[FFmpeg-cvslog] Revert "aviobuf: Discard old buffered, previously read data in ffio_read_partial"

Marton Balint git at videolan.org
Sat Oct 17 00:21:19 EEST 2020


ffmpeg | branch: master | Marton Balint <cus at passwd.hu> | Fri Oct  9 00:18:07 2020 +0200| [f076a5fef63d431107a9431cd4b1b82aea164f67] | committer: Marton Balint

Revert "aviobuf: Discard old buffered, previously read data in ffio_read_partial"

This is unneeded after 2ca48e466675a8a3630061cd2c15325eab8eda97 and it breaks
ffio_ensure_seekback().

This reverts commit 53c25ee0736497b46bb76064cc2c84c976b2d295.

Signed-off-by: Marton Balint <cus at passwd.hu>

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

 libavformat/aviobuf.c | 7 -------
 1 file changed, 7 deletions(-)

diff --git a/libavformat/aviobuf.c b/libavformat/aviobuf.c
index 15d91f91bc..80a5a565a4 100644
--- a/libavformat/aviobuf.c
+++ b/libavformat/aviobuf.c
@@ -719,13 +719,6 @@ int avio_read_partial(AVIOContext *s, unsigned char *buf, int size)
 
     len = s->buf_end - s->buf_ptr;
     if (len == 0) {
-        /* Reset the buf_end pointer to the start of the buffer, to make sure
-         * the fill_buffer call tries to read as much data as fits into the
-         * full buffer, instead of just what space is left after buf_end.
-         * This avoids returning partial packets at the end of the buffer,
-         * for packet based inputs.
-         */
-        s->buf_end = s->buf_ptr = s->buffer;
         fill_buffer(s);
         len = s->buf_end - s->buf_ptr;
     }



More information about the ffmpeg-cvslog mailing list