From 80c6e238b0f42a0b07fbc195564a50032b3608ba Mon Sep 17 00:00:00 2001 From: Anton Khirnov Date: Mon, 4 Apr 2011 20:15:44 +0200 Subject: avio: avio_ prefix for url_set_interrupt_cb. --- libavformat/avio.c | 6 +++++- libavformat/avio.h | 3 ++- 2 files changed, 7 insertions(+), 2 deletions(-) (limited to 'libavformat') diff --git a/libavformat/avio.c b/libavformat/avio.c index 8c53e5cd36..bacf9f35cd 100644 --- a/libavformat/avio.c +++ b/libavformat/avio.c @@ -216,6 +216,10 @@ void url_get_filename(URLContext *h, char *buf, int buf_size) { av_strlcpy(buf, h->filename, buf_size); } +void url_set_interrupt_cb(URLInterruptCB *interrupt_cb) +{ + avio_set_interrupt_cb(interrupt_cb); +} #endif #define URL_SCHEME_CHARS \ @@ -381,7 +385,7 @@ static int default_interrupt_cb(void) return 0; } -void url_set_interrupt_cb(URLInterruptCB *interrupt_cb) +void avio_set_interrupt_cb(URLInterruptCB *interrupt_cb) { if (!interrupt_cb) interrupt_cb = default_interrupt_cb; diff --git a/libavformat/avio.h b/libavformat/avio.h index 4035e24571..3a4b64e44d 100644 --- a/libavformat/avio.h +++ b/libavformat/avio.h @@ -117,6 +117,7 @@ attribute_deprecated void url_get_filename(URLContext *h, char *buf, int buf_siz attribute_deprecated int av_url_read_pause(URLContext *h, int pause); attribute_deprecated int64_t av_url_read_seek(URLContext *h, int stream_index, int64_t timestamp, int flags); +attribute_deprecated void url_set_interrupt_cb(URLInterruptCB *interrupt_cb); #endif /** @@ -131,7 +132,7 @@ int url_exist(const char *url); * in this case by the interrupted function. 'NULL' means no interrupt * callback is given. */ -void url_set_interrupt_cb(URLInterruptCB *interrupt_cb); +void avio_set_interrupt_cb(URLInterruptCB *interrupt_cb); #if FF_API_OLD_AVIO /* not implemented */ -- cgit v1.2.3