avio: cosmetics, move AVSEEK_SIZE/FORCE declarations together

oldabi
Anton Khirnov 14 years ago
parent 925e908bc7
commit 230a468679
  1. 30
      libavformat/avio.h

@ -110,13 +110,6 @@ attribute_deprecated int url_read_complete(URLContext *h, unsigned char *buf, in
attribute_deprecated int url_write(URLContext *h, const unsigned char *buf, int size);
#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 {
@ -473,6 +458,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.

Loading…
Cancel
Save