From: Anton Khirnov <anton@khirnov.net>
Date: Mon, 4 Apr 2011 18:40:38 +0000 (+0200)
Subject: avio: move extern url_interrupt_cb declaration from avio.h to url.h
X-Git-Tag: n0.8~523^2~355
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=5cec8971056f92215d4199235907d944abdb5a81;p=coroid%2Fffmpeg_saccubus.git

avio: move extern url_interrupt_cb declaration from avio.h to url.h
---

diff --git a/libavformat/applehttp.c b/libavformat/applehttp.c
index 9e11fcad1..6c697c50b 100644
--- a/libavformat/applehttp.c
+++ b/libavformat/applehttp.c
@@ -31,6 +31,7 @@
 #include "internal.h"
 #include <unistd.h>
 #include "avio_internal.h"
+#include "url.h"
 
 #define INITIAL_BUFFER_SIZE 32768
 
diff --git a/libavformat/avio.h b/libavformat/avio.h
index 41f51aaed..e9aa49991 100644
--- a/libavformat/avio.h
+++ b/libavformat/avio.h
@@ -163,7 +163,9 @@ typedef struct URLProtocol {
 extern URLProtocol *first_protocol;
 #endif
 
+#if FF_API_OLD_AVIO
 extern URLInterruptCB *url_interrupt_cb;
+#endif
 
 /**
  * If protocol is NULL, returns the first registered protocol,
diff --git a/libavformat/tcp.c b/libavformat/tcp.c
index c0999832d..8e380ac37 100644
--- a/libavformat/tcp.c
+++ b/libavformat/tcp.c
@@ -24,6 +24,7 @@
 #include "internal.h"
 #include "network.h"
 #include "os_support.h"
+#include "url.h"
 #if HAVE_POLL_H
 #include <poll.h>
 #endif
diff --git a/libavformat/udp.c b/libavformat/udp.c
index 7dad38bc6..07d1775e9 100644
--- a/libavformat/udp.c
+++ b/libavformat/udp.c
@@ -33,6 +33,7 @@
 #include "internal.h"
 #include "network.h"
 #include "os_support.h"
+#include "url.h"
 #include <sys/time.h>
 
 #ifndef IPV6_ADD_MEMBERSHIP
diff --git a/libavformat/url.h b/libavformat/url.h
index 2e1a3f3a7..7482611e1 100644
--- a/libavformat/url.h
+++ b/libavformat/url.h
@@ -30,6 +30,8 @@
 
 #if !FF_API_OLD_AVIO
 #define URL_PROTOCOL_FLAG_NESTED_SCHEME 1 /*< The protocol name can be the first part of a nested protocol scheme */
+
+extern URLInterruptCB *url_interrupt_cb;
 #endif
 
 /**
diff --git a/libavformat/utils.c b/libavformat/utils.c
index b06fef02b..da8f3fd3b 100644
--- a/libavformat/utils.c
+++ b/libavformat/utils.c
@@ -31,6 +31,7 @@
 #include "libavutil/avstring.h"
 #include "riff.h"
 #include "audiointerleave.h"
+#include "url.h"
 #include <sys/time.h>
 #include <time.h>
 #include <strings.h>