[FFmpeg-cvslog] avio: cosmetics, group the reading functions.

Anton Khirnov git at videolan.org
Mon Apr 11 04:12:09 CEST 2011


ffmpeg | branch: master | Anton Khirnov <anton at khirnov.net> | Sat Apr  9 08:55:53 2011 +0200| [72d4405b66be0ec22ba01cc360a7e826ab910efd] | committer: Anton Khirnov

avio: cosmetics, group the reading functions.

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

 libavformat/avio.h |   20 ++++++++++++++------
 1 files changed, 14 insertions(+), 6 deletions(-)

diff --git a/libavformat/avio.h b/libavformat/avio.h
index 73b023c..b30866c 100644
--- a/libavformat/avio.h
+++ b/libavformat/avio.h
@@ -461,13 +461,25 @@ void avio_flush(AVIOContext *s);
  */
 int avio_read(AVIOContext *s, unsigned char *buf, int size);
 
-/** @note return 0 if EOF, so you cannot use it if EOF handling is
-    necessary */
+/**
+ * @defgroup avio_read Functions for reading from AVIOContext.
+ * @{
+ *
+ * @note return 0 if EOF, so you cannot use it if EOF handling is
+ *       necessary
+ */
 int          avio_r8  (AVIOContext *s);
 unsigned int avio_rl16(AVIOContext *s);
 unsigned int avio_rl24(AVIOContext *s);
 unsigned int avio_rl32(AVIOContext *s);
 uint64_t     avio_rl64(AVIOContext *s);
+unsigned int avio_rb16(AVIOContext *s);
+unsigned int avio_rb24(AVIOContext *s);
+unsigned int avio_rb32(AVIOContext *s);
+uint64_t     avio_rb64(AVIOContext *s);
+/**
+ * @}
+ */
 
 /**
  * Read a string from pb into buf. The reading will terminate when either
@@ -492,10 +504,6 @@ int avio_get_str(AVIOContext *pb, int maxlen, char *buf, int buflen);
 int avio_get_str16le(AVIOContext *pb, int maxlen, char *buf, int buflen);
 int avio_get_str16be(AVIOContext *pb, int maxlen, char *buf, int buflen);
 
-unsigned int avio_rb16(AVIOContext *s);
-unsigned int avio_rb24(AVIOContext *s);
-unsigned int avio_rb32(AVIOContext *s);
-uint64_t     avio_rb64(AVIOContext *s);
 
 #if FF_API_URL_RESETBUF
 /** Reset the buffer for reading or writing.



More information about the ffmpeg-cvslog mailing list