aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAnton Khirnov <anton@khirnov.net>2011-03-06 18:04:46 +0100
committerRonald S. Bultje <rsbultje@gmail.com>2011-03-07 10:19:46 -0500
commit655e45e7dfafc494044cc52f8889fc6da75eff6a (patch)
tree046f5b194cec840bbbb56698a8fdafd129c065f8
parent2af07d36fc0e9f7e10e07b6336748a73ae2e2909 (diff)
downloadffmpeg-655e45e7dfafc494044cc52f8889fc6da75eff6a.tar.gz
avio: deprecate url_fgets
It's not used anywhere and doesn't look ver useful to be public. Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
-rw-r--r--libavformat/avio.h4
-rw-r--r--libavformat/aviobuf.c2
2 files changed, 5 insertions, 1 deletions
diff --git a/libavformat/avio.h b/libavformat/avio.h
index a998808788..a3bf5c01d4 100644
--- a/libavformat/avio.h
+++ b/libavformat/avio.h
@@ -514,9 +514,11 @@ int url_fprintf(AVIOContext *s, const char *fmt, ...) __attribute__ ((__format__
int url_fprintf(AVIOContext *s, const char *fmt, ...);
#endif
+#if FF_API_OLD_AVIO
/** @note unlike fgets, the EOL character is not returned and a whole
line is parsed. return NULL if first char read was EOF */
-char *url_fgets(AVIOContext *s, char *buf, int buf_size);
+attribute_deprecated char *url_fgets(AVIOContext *s, char *buf, int buf_size);
+#endif
void put_flush_packet(AVIOContext *s);
diff --git a/libavformat/aviobuf.c b/libavformat/aviobuf.c
index e273aa536a..290572435e 100644
--- a/libavformat/aviobuf.c
+++ b/libavformat/aviobuf.c
@@ -915,6 +915,7 @@ int url_fprintf(AVIOContext *s, const char *fmt, ...)
}
#endif //CONFIG_MUXERS
+#if FF_API_OLD_AVIO
char *url_fgets(AVIOContext *s, char *buf, int buf_size)
{
int c;
@@ -935,6 +936,7 @@ char *url_fgets(AVIOContext *s, char *buf, int buf_size)
*q = '\0';
return buf;
}
+#endif
int url_fget_max_packet_size(AVIOContext *s)
{