[FFmpeg-cvslog] avio: flush the internal buffer in avio_close()
Stefano Sabatini
git at videolan.org
Sun Sep 16 14:29:18 CEST 2012
ffmpeg | branch: master | Stefano Sabatini <stefasab at gmail.com> | Thu Aug 16 01:25:05 2012 +0200| [5d1203f0635a0b14bea6cc609026936bd7ae9e3a] | committer: Anton Khirnov
avio: flush the internal buffer in avio_close()
This is consistent with stdio, and thus what people would naturally
expect.
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=5d1203f0635a0b14bea6cc609026936bd7ae9e3a
---
libavformat/avio.h | 3 +++
libavformat/aviobuf.c | 1 +
libavformat/img2enc.c | 2 --
libavformat/version.h | 2 +-
4 files changed, 5 insertions(+), 3 deletions(-)
diff --git a/libavformat/avio.h b/libavformat/avio.h
index 10c0a12..55c96bc 100644
--- a/libavformat/avio.h
+++ b/libavformat/avio.h
@@ -349,6 +349,9 @@ int avio_open2(AVIOContext **s, const char *url, int flags,
* Close the resource accessed by the AVIOContext s and free it.
* This function can only be used if s was opened by avio_open().
*
+ * The internal buffer is automatically flushed before closing the
+ * resource.
+ *
* @return 0 on success, an AVERROR < 0 on error.
*/
int avio_close(AVIOContext *s);
diff --git a/libavformat/aviobuf.c b/libavformat/aviobuf.c
index fb01613..7dc66e2 100644
--- a/libavformat/aviobuf.c
+++ b/libavformat/aviobuf.c
@@ -761,6 +761,7 @@ int avio_close(AVIOContext *s)
if (!s)
return 0;
+ avio_flush(s);
h = s->opaque;
av_freep(&s->buffer);
av_free(s);
diff --git a/libavformat/img2enc.c b/libavformat/img2enc.c
index 6273af9..bf18356 100644
--- a/libavformat/img2enc.c
+++ b/libavformat/img2enc.c
@@ -86,8 +86,6 @@ static int write_packet(AVFormatContext *s, AVPacket *pkt)
avio_write(pb[0], pkt->data , ysize);
avio_write(pb[1], pkt->data + ysize, (pkt->size - ysize)/2);
avio_write(pb[2], pkt->data + ysize +(pkt->size - ysize)/2, (pkt->size - ysize)/2);
- avio_flush(pb[1]);
- avio_flush(pb[2]);
avio_close(pb[1]);
avio_close(pb[2]);
}else{
diff --git a/libavformat/version.h b/libavformat/version.h
index fa4d49a..a86f35a 100644
--- a/libavformat/version.h
+++ b/libavformat/version.h
@@ -31,7 +31,7 @@
#define LIBAVFORMAT_VERSION_MAJOR 54
#define LIBAVFORMAT_VERSION_MINOR 16
-#define LIBAVFORMAT_VERSION_MICRO 0
+#define LIBAVFORMAT_VERSION_MICRO 1
#define LIBAVFORMAT_VERSION_INT AV_VERSION_INT(LIBAVFORMAT_VERSION_MAJOR, \
LIBAVFORMAT_VERSION_MINOR, \
More information about the ffmpeg-cvslog
mailing list