From 374e469b8dcef1c3d9a7769fad178cbed210da73 Mon Sep 17 00:00:00 2001
From: Anton Khirnov <anton@khirnov.net>
Date: Thu, 12 Jan 2012 13:31:55 +0100
Subject: [PATCH] lavf: remove disabled FF_API_OLD_INTERRUPT_CB cruft

---
 libavformat/avio.c    | 23 -----------------------
 libavformat/avio.h    | 12 ------------
 libavformat/version.h |  3 ---
 3 files changed, 38 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
 }
 
diff --git a/libavformat/avio.h b/libavformat/avio.h
index ad96775910..0ab92c32e5 100644
--- a/libavformat/avio.h
+++ b/libavformat/avio.h
@@ -133,18 +133,6 @@ typedef struct {
  */
 int avio_check(const char *url, int flags);
 
-#if FF_API_OLD_INTERRUPT_CB
-/**
- * The callback is called in blocking functions to test regulary if
- * asynchronous interruption is needed. AVERROR_EXIT is returned
- * in this case by the interrupted function. 'NULL' means no interrupt
- * callback is given.
- * @deprecated Use interrupt_callback in AVFormatContext/avio_open2
- *             instead.
- */
-attribute_deprecated void avio_set_interrupt_cb(int (*interrupt_cb)(void));
-#endif
-
 /**
  * Allocate and initialize an AVIOContext for buffered I/O. It must be later
  * freed with av_free().
diff --git a/libavformat/version.h b/libavformat/version.h
index 3051042d1d..4a6f74bc98 100644
--- a/libavformat/version.h
+++ b/libavformat/version.h
@@ -47,9 +47,6 @@
  * Those FF_API_* defines are not part of public API.
  * They may change, break or disappear at any time.
  */
-#ifndef FF_API_OLD_INTERRUPT_CB
-#define FF_API_OLD_INTERRUPT_CB        (LIBAVFORMAT_VERSION_MAJOR < 54)
-#endif
 #ifndef FF_API_SET_PTS_INFO
 #define FF_API_SET_PTS_INFO            (LIBAVFORMAT_VERSION_MAJOR < 54)
 #endif