[FFmpeg-devel] [PATCH 3/4] avio: cosmetics - group and vertically align get_ functions

[Anton Khirnov]

---
 libavformat/avio.h |   76 ++++++++++++++++++++++++++--------------------------
 1 files changed, 38 insertions(+), 38 deletions(-)

diff --git a/libavformat/avio.h b/libavformat/avio.h
index 99acfe0..609ff58 100644
--- a/libavformat/avio.h
+++ b/libavformat/avio.h
@@ -413,6 +413,44 @@ int avio_put_str(ByteIOContext *s, const char *str);
  */
 int avio_put_str16le(ByteIOContext *s, const char *str);
 
+
+/**
+ * Read size bytes from ByteIOContext into buf.
+ * @return number of bytes read or AVERROR
+ */
+int avio_get_buffer(ByteIOContext *s, unsigned char *buf, int size);
+
+/**
+ * Read size bytes from ByteIOContext into buf.
+ * This reads at most 1 packet. If that is not enough fewer bytes will be
+ * returned.
+ * @return number of bytes read or AVERROR
+ */
+int avio_get_partial_buffer(ByteIOContext *s, unsigned char *buf, int size);
+
+/** @note return 0 if EOF, so you cannot use it if EOF handling is
+    necessary */
+int          avio_get_byte(ByteIOContext *s);
+unsigned int avio_get_le16(ByteIOContext *s);
+unsigned int avio_get_le24(ByteIOContext *s);
+unsigned int avio_get_le32(ByteIOContext *s);
+uint64_t     avio_get_le64(ByteIOContext *s);
+unsigned int avio_get_be16(ByteIOContext *s);
+unsigned int avio_get_be24(ByteIOContext *s);
+unsigned int avio_get_be32(ByteIOContext *s);
+uint64_t     avio_get_be64(ByteIOContext *s);
+
+/**
+ * Read a UTF-16 string from pb and convert it to UTF-8.
+ * The reading will terminate when either a null or invalid character was
+ * encountered or maxlen bytes have been read.
+ * @return number of bytes read (is always <= maxlen)
+ */
+int avio_get_str16le(ByteIOContext *pb, int maxlen, char *buf, int buflen);
+int avio_get_str16be(ByteIOContext *pb, int maxlen, char *buf, int buflen);
+
+char *get_strz(ByteIOContext *s, char *buf, int maxlen);
+
 /**
  * fseek() equivalent for ByteIOContext.
  * @return new position or AVERROR.
@@ -467,44 +505,6 @@ char *url_fgets(ByteIOContext *s, char *buf, int buf_size);
 
 void put_flush_packet(ByteIOContext *s);
 
-
-/**
- * Read size bytes from ByteIOContext into buf.
- * @return number of bytes read or AVERROR
- */
-int avio_get_buffer(ByteIOContext *s, unsigned char *buf, int size);
-
-/**
- * Read size bytes from ByteIOContext into buf.
- * This reads at most 1 packet. If that is not enough fewer bytes will be
- * returned.
- * @return number of bytes read or AVERROR
- */
-int avio_get_partial_buffer(ByteIOContext *s, unsigned char *buf, int size);
-
-/** @note return 0 if EOF, so you cannot use it if EOF handling is
-    necessary */
-int avio_get_byte(ByteIOContext *s);
-unsigned int avio_get_le24(ByteIOContext *s);
-unsigned int avio_get_le32(ByteIOContext *s);
-uint64_t avio_get_le64(ByteIOContext *s);
-unsigned int avio_get_le16(ByteIOContext *s);
-
-/**
- * Read a UTF-16 string from pb and convert it to UTF-8.
- * The reading will terminate when either a null or invalid character was
- * encountered or maxlen bytes have been read.
- * @return number of bytes read (is always <= maxlen)
- */
-int avio_get_str16le(ByteIOContext *pb, int maxlen, char *buf, int buflen);
-int avio_get_str16be(ByteIOContext *pb, int maxlen, char *buf, int buflen);
-
-char *get_strz(ByteIOContext *s, char *buf, int maxlen);
-unsigned int avio_get_be16(ByteIOContext *s);
-unsigned int avio_get_be24(ByteIOContext *s);
-unsigned int avio_get_be32(ByteIOContext *s);
-uint64_t avio_get_be64(ByteIOContext *s);
-
 uint64_t ff_get_v(ByteIOContext *bc);
 
 static inline int url_is_streamed(ByteIOContext *s)
-- 
1.7.2.3