avio_flush() did nothing useful for read streams. Fix it to behave as
expected, and discard the currently read buffer properly.
---
Since avio_flush() was just broken for read streams, I don't think this
needs to be treated as an API-change.
---
libavformat/avio.h | 8 ++++++--
libavformat/aviobuf.c | 2 ++
2 files changed, 8 insertions(+), 2 deletions(-)
diff --git a/libavformat/avio.h b/libavformat/avio.h
index 2210c01..86f754e 100644
--- a/libavformat/avio.h
+++ b/libavformat/avio.h
@@ -289,10 +289,14 @@ int url_feof(AVIOContext *s);
int avio_printf(AVIOContext *s, const char *fmt, ...) av_printf_format(2, 3);
/**
- * Force flushing of buffered data to the output s.
+ * Force flushing of buffered data.
*
- * Force the buffered data to be immediately written to the output,
+ * For write streams, force the buffered data to be immediately written to the
output,
* without to wait to fill the internal buffer.
+ *
+ * For read streams, discard all currently buffered data, and advance the
+ * reported file position to that of the underlying stream. This does not
+ * read new data, and does not perform any seeks.
*/
void avio_flush(AVIOContext *s);
diff --git a/libavformat/aviobuf.c b/libavformat/aviobuf.c
index 9795ba4..b8586bd 100644
--- a/libavformat/aviobuf.c
+++ b/libavformat/aviobuf.c
@@ -148,6 +148,8 @@ static void flush_buffer(AVIOContext *s)
}
}
s->buf_ptr = s->buffer;
+ if (!s->write_flag)
+ s->buf_end = s->buffer;
}
void avio_w8(AVIOContext *s, int b)
--
2.1.0
_______________________________________________
ffmpeg-devel mailing list
ffmpeg-devel@ffmpeg.org
http://ffmpeg.org/mailman/listinfo/ffmpeg-devel
