From 8d9769a77b49b0d633c835d99ed3c0aa3f3b77a1 Mon Sep 17 00:00:00 2001 From: Anton Khirnov Date: Thu, 17 Mar 2011 14:03:31 +0100 Subject: [PATCH] avio: deprecate url_fileno It's an evil hack that assumes an AVIOContext is always based on top of an URLContext. It's also not used anywhere. Signed-off-by: Ronald S. Bultje --- libavformat/avio.h | 3 ++- libavformat/aviobuf.c | 2 ++ 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/libavformat/avio.h b/libavformat/avio.h index e9d3b1752b..1b483b3a4d 100644 --- a/libavformat/avio.h +++ b/libavformat/avio.h @@ -623,9 +623,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 4cd3bdc47d..9f0f292aff 100644 --- a/libavformat/aviobuf.c +++ b/libavformat/aviobuf.c @@ -923,10 +923,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, ...) {