[FFmpeg-cvslog] avio: cosmetics, move AVSEEK_SIZE/FORCE declarations together

Anton Khirnov git at videolan.org
Tue Apr 5 02:33:10 CEST 2011


ffmpeg | branch: master | Anton Khirnov <anton at khirnov.net> | Thu Mar 31 17:26:09 2011 +0200| [230a4686790ce97f9016b4e617f6bb4078560a3f] | committer: Anton Khirnov

avio: cosmetics, move AVSEEK_SIZE/FORCE declarations together

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

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

diff --git a/libavformat/avio.h b/libavformat/avio.h
index 41b3caf..fe9dc36 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.
  */



More information about the ffmpeg-cvslog mailing list