avio: Fix the deprecated fallback URL-prefixed open flags

Message ID 1303976472-45280-1-git-send-email-martin@martin.st
State Committed
Commit 5b81e295931bad4dac0af29333b4e2a203b3f4d4
Headers show

Commit Message

Martin Storsjö April 28, 2011, 7:41 a.m.
While deprecated, they're totally useless as long as their values
are different from the AVIO_FLAG values that are used internally.
Currently, this leads to old libav applications still compiling
correctly (since we haven't removed the fallback wrappers), but
failing since the functions internally compare to the new AVIO_FLAG
values.

These should be removed at some point, but they aren't removed yet.
The intent is to be able to recompile an old application against
the new ABI without modifying the code, and this doesn't work
currently.
---
 libavformat/avio.h |    6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)

Comments

Luca Barbato April 28, 2011, 9:35 a.m. | #1
On 4/28/11 9:41 AM, Martin Storsjö wrote:
> These should be removed at some point, but they aren't removed yet.
> The intent is to be able to recompile an old application against
> the new ABI without modifying the code, and this doesn't work
> currently.

Ok.
Martin Storsjö April 28, 2011, 8:29 p.m. | #2
On Thu, 28 Apr 2011, Luca Barbato wrote:

> On 4/28/11 9:41 AM, Martin Storsjö wrote:
> > These should be removed at some point, but they aren't removed yet.
> > The intent is to be able to recompile an old application against
> > the new ABI without modifying the code, and this doesn't work
> > currently.
> 
> Ok.

Discussed with Anton on irc, and he was ok with it, too. Pushed.

// Martin

Patch

diff --git a/libavformat/avio.h b/libavformat/avio.h
index a4ab5ae..b98137b 100644
--- a/libavformat/avio.h
+++ b/libavformat/avio.h
@@ -150,9 +150,9 @@  attribute_deprecated int url_poll(URLPollEntry *poll_table, int n, int timeout);
  * constants, optionally ORed with other flags.
  * @{
  */
-#define URL_RDONLY 0  /**< read-only */
-#define URL_WRONLY 1  /**< write-only */
-#define URL_RDWR   2  /**< read-write */
+#define URL_RDONLY 1  /**< read-only */
+#define URL_WRONLY 2  /**< write-only */
+#define URL_RDWR   (URL_RDONLY|URL_WRONLY)  /**< read-write */
 /**
  * @}
  */