From f29f269d999fc4bb8a9bfa85629f08b89971a2ef Mon Sep 17 00:00:00 2001
From: chenshijun <csj_sky@126.com>
Date: 星期二, 03 十二月 2019 16:00:49 +0800
Subject: [PATCH] Merge branch 'master' of ssh://192.168.5.5:29418/valib/goffmpeg
---
csrc/thirdparty/ffmpeg/include/libavformat/avio.h | 6 +++---
1 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/csrc/thirdparty/ffmpeg/include/libavformat/avio.h b/csrc/thirdparty/ffmpeg/include/libavformat/avio.h
index 75912ce..dcb8dcd 100644
--- a/csrc/thirdparty/ffmpeg/include/libavformat/avio.h
+++ b/csrc/thirdparty/ffmpeg/include/libavformat/avio.h
@@ -236,7 +236,7 @@
int (*write_packet)(void *opaque, uint8_t *buf, int buf_size);
int64_t (*seek)(void *opaque, int64_t offset, int whence);
int64_t pos; /**< position in the file of the current buffer */
- int eof_reached; /**< true if eof reached */
+ int eof_reached; /**< true if was unable to read due to error or eof */
int write_flag; /**< true if open for writing */
int max_packet_size;
unsigned long checksum;
@@ -566,8 +566,8 @@
int64_t avio_size(AVIOContext *s);
/**
- * feof() equivalent for AVIOContext.
- * @return non zero if and only if end of file
+ * Similar to feof() but also returns nonzero on read errors.
+ * @return non zero if and only if at end of file or a read error happened when reading.
*/
int avio_feof(AVIOContext *s);
--
Gitblit v1.8.0