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

Martin Storsjö git at videolan.org
Fri Jan 4 13:33:32 CET 2013


ffmpeg | branch: master | Martin Storsjö <martin at martin.st> | Wed Jan  2 00:25:37 2013 +0200| [53c25ee0736497b46bb76064cc2c84c976b2d295] | committer: Martin Storsjö

aviobuf: Discard old buffered, previously read data in ffio_read_partial

This makes RTP custom IO work properly with pure read-only
AVIOContexts as well.

Signed-off-by: Martin Storsjö <martin at martin.st>

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

 libavformat/aviobuf.c |    7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/libavformat/aviobuf.c b/libavformat/aviobuf.c
index 8f3e511..d2eaf36 100644
--- a/libavformat/aviobuf.c
+++ b/libavformat/aviobuf.c
@@ -506,6 +506,13 @@ int ffio_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