summaryrefslogtreecommitdiff
path: root/libavformat/avio.c
diff options
context:
space:
mode:
authorAnton Khirnov <anton@khirnov.net>2012-01-12 13:31:55 +0100
committerAnton Khirnov <anton@khirnov.net>2012-01-27 10:52:43 +0100
commit374e469b8dcef1c3d9a7769fad178cbed210da73 (patch)
tree8d56efd2a2fed5f6939eec4dad46cefcdda06b73 /libavformat/avio.c
parentbf868727d7100246c5bdf74570829d44bbb335be (diff)
lavf: remove disabled FF_API_OLD_INTERRUPT_CB cruft
Diffstat (limited to 'libavformat/avio.c')
-rw-r--r--libavformat/avio.c23
1 files changed, 0 insertions, 23 deletions
diff --git a/libavformat/avio.c b/libavformat/avio.c
index f2fec5bdef..067f2958e0 100644
--- a/libavformat/avio.c
+++ b/libavformat/avio.c
@@ -84,11 +84,6 @@ const AVClass ffurl_context_class = {
/*@}*/
-#if FF_API_OLD_INTERRUPT_CB
-static int default_interrupt_cb(void);
-int (*url_interrupt_cb)(void) = default_interrupt_cb;
-#endif
-
const char *avio_enum_protocols(void **opaque, int output)
{
URLProtocol **p = opaque;
@@ -350,29 +345,11 @@ int ffurl_get_file_handle(URLContext *h)
return h->prot->url_get_file_handle(h);
}
-#if FF_API_OLD_INTERRUPT_CB
-static int default_interrupt_cb(void)
-{
- return 0;
-}
-
-void avio_set_interrupt_cb(int (*interrupt_cb)(void))
-{
- if (!interrupt_cb)
- interrupt_cb = default_interrupt_cb;
- url_interrupt_cb = interrupt_cb;
-}
-#endif
-
int ff_check_interrupt(AVIOInterruptCB *cb)
{
int ret;
if (cb && cb->callback && (ret = cb->callback(cb->opaque)))
return ret;
-#if FF_API_OLD_INTERRUPT_CB
- return url_interrupt_cb();
-#else
return 0;
-#endif
}