aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAnton Khirnov <anton@khirnov.net>2011-03-31 17:26:09 +0200
committerAnton Khirnov <anton@khirnov.net>2011-04-04 17:45:20 +0200
commit230a4686790ce97f9016b4e617f6bb4078560a3f (patch)
tree6602aee840adb8361f4e3d5cd1863104c25c50e2
parent925e908bc7a3ddbd31f94ae9a67fbee170fef3d3 (diff)
downloadffmpeg-230a4686790ce97f9016b4e617f6bb4078560a3f.tar.gz
avio: cosmetics, move AVSEEK_SIZE/FORCE declarations together
-rw-r--r--libavformat/avio.h30
1 files changed, 15 insertions, 15 deletions
diff --git a/libavformat/avio.h b/libavformat/avio.h
index 41b3cafbd2..fe9dc36c24 100644
--- a/libavformat/avio.h
+++ b/libavformat/avio.h
@@ -111,13 +111,6 @@ attribute_deprecated int url_write(URLContext *h, const unsigned char *buf, int
#endif
/**
- * Passing this as the "whence" parameter to a seek function causes it to
- * return the filesize without seeking anywhere. Supporting this is optional.
- * If it is not supported then the seek function will return <0.
- */
-#define AVSEEK_SIZE 0x10000
-
-/**
* Change the position that will be used by the next read/write
* operation on the resource accessed by h.
*
@@ -220,14 +213,6 @@ int av_url_read_pause(URLContext *h, int pause);
int64_t av_url_read_seek(URLContext *h, int stream_index,
int64_t timestamp, int flags);
-/**
- * Oring this flag as into the "whence" parameter to a seek function causes it to
- * seek by any means (like reopening and linear reading) or other normally unreasonble
- * means that can be extreemly slow.
- * This may be ignored by the seek code.
- */
-#define AVSEEK_FORCE 0x20000
-
#define URL_PROTOCOL_FLAG_NESTED_SCHEME 1 /*< The protocol name can be the first part of a nested protocol scheme */
typedef struct URLProtocol {
@@ -474,6 +459,21 @@ int avio_put_str(AVIOContext *s, const char *str);
int avio_put_str16le(AVIOContext *s, const char *str);
/**
+ * Passing this as the "whence" parameter to a seek function causes it to
+ * return the filesize without seeking anywhere. Supporting this is optional.
+ * If it is not supported then the seek function will return <0.
+ */
+#define AVSEEK_SIZE 0x10000
+
+/**
+ * Oring this flag as into the "whence" parameter to a seek function causes it to
+ * seek by any means (like reopening and linear reading) or other normally unreasonble
+ * means that can be extreemly slow.
+ * This may be ignored by the seek code.
+ */
+#define AVSEEK_FORCE 0x20000
+
+/**
* fseek() equivalent for AVIOContext.
* @return new position or AVERROR.
*/