diff options
| author | Anton Khirnov <anton@khirnov.net> | 2011-04-13 07:35:35 +0200 |
|---|---|---|
| committer | Anton Khirnov <anton@khirnov.net> | 2011-04-13 07:36:32 +0200 |
| commit | cbea3ac8203690dec29c473399a50f8f6bb76c47 (patch) | |
| tree | d34904f794492f680ccf2f2d73416ee94ab13a2d /libavformat | |
| parent | d2940155106c21f04d5a609db7cf655fe1d8d8b1 (diff) | |
| download | ffmpeg-cbea3ac8203690dec29c473399a50f8f6bb76c47.tar.gz | |
avio: left-shift AVIO_ flags on next bump
Now AVIO_RDONLY is defined as 0, so it's not usable as a flag.
Diffstat (limited to 'libavformat')
| -rw-r--r-- | libavformat/avio.h | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/libavformat/avio.h b/libavformat/avio.h index b980d491ae..a4109a2996 100644 --- a/libavformat/avio.h +++ b/libavformat/avio.h @@ -537,9 +537,15 @@ int url_resetbuf(AVIOContext *s, int flags); * constants, optionally ORed with other flags. * @{ */ +#if LIBAVFORMAT_VERSION_MAJOR < 53 #define AVIO_RDONLY 0 /**< read-only */ #define AVIO_WRONLY 1 /**< write-only */ #define AVIO_RDWR 2 /**< read-write */ +#else +#define AVIO_RDONLY 1 /**< read-only */ +#define AVIO_WRONLY 2 /**< write-only */ +#define AVIO_RDWR 4 /**< read-write */ +#endif /** * @} */ @@ -556,7 +562,11 @@ int url_resetbuf(AVIOContext *s, int flags); * Warning: non-blocking protocols is work-in-progress; this flag may be * silently ignored. */ +#if LIBAVFORMAT_VERSION_MAJOR < 53 #define AVIO_FLAG_NONBLOCK 4 +#else +#define AVIO_FLAG_NONBLOCK 8 +#endif /** * Create and initialize a AVIOContext for accessing the |