[5/9] avio: deprecate url_fileno

Message ID 1300367015-21591-6-git-send-email-anton@khirnov.net
State Committed
Commit 8d9769a77b49b0d633c835d99ed3c0aa3f3b77a1
Headers show

Commit Message

Anton Khirnov March 17, 2011, 1:03 p.m.
It's an evil hack that assumes an AVIOContext is always based on top of
an URLContext.
It's also not used anywhere.
---
 libavformat/avio.h    |    3 ++-
 libavformat/aviobuf.c |    2 ++
 2 files changed, 4 insertions(+), 1 deletions(-)

Comments

Ronald Bultje March 21, 2011, 12:25 a.m. | #1
Hi,

On Thu, Mar 17, 2011 at 9:03 AM, Anton Khirnov <anton@khirnov.net> wrote:
> It's an evil hack that assumes an AVIOContext is always based on top of
> an URLContext.
> It's also not used anywhere.
> ---
>  libavformat/avio.h    |    3 ++-
>  libavformat/aviobuf.c |    2 ++
>  2 files changed, 4 insertions(+), 1 deletions(-)

Queued.

Ronald

Patch

diff --git a/libavformat/avio.h b/libavformat/avio.h
index 017264b..2d96801 100644
--- a/libavformat/avio.h
+++ b/libavformat/avio.h
@@ -643,9 +643,10 @@  int url_resetbuf(AVIOContext *s, int flags);
 int avio_open(AVIOContext **s, const char *url, int flags);
 
 int avio_close(AVIOContext *s);
-URLContext *url_fileno(AVIOContext *s);
 
 #if FF_API_OLD_AVIO
+attribute_deprecated URLContext *url_fileno(AVIOContext *s);
+
 /**
  * @deprecated use AVIOContext.max_packet_size directly.
  */
diff --git a/libavformat/aviobuf.c b/libavformat/aviobuf.c
index 0dbfa54..a7c5d28 100644
--- a/libavformat/aviobuf.c
+++ b/libavformat/aviobuf.c
@@ -954,10 +954,12 @@  int avio_close(AVIOContext *s)
     return url_close(h);
 }
 
+#if FF_API_OLD_AVIO
 URLContext *url_fileno(AVIOContext *s)
 {
     return s->opaque;
 }
+#endif
 
 int avio_printf(AVIOContext *s, const char *fmt, ...)
 {