diff options
| author | Anton Khirnov <anton@khirnov.net> | 2011-04-04 20:40:38 +0200 |
|---|---|---|
| committer | Anton Khirnov <anton@khirnov.net> | 2011-04-07 18:11:24 +0200 |
| commit | 5cec8971056f92215d4199235907d944abdb5a81 (patch) | |
| tree | cb2ca31489ed3fa76b9ddf57f51adacc97580758 | |
| parent | 8e76a19b63a3fa322a64a7d27bd6e642c7fe7f85 (diff) | |
| download | ffmpeg-5cec8971056f92215d4199235907d944abdb5a81.tar.gz | |
avio: move extern url_interrupt_cb declaration from avio.h to url.h
| -rw-r--r-- | libavformat/applehttp.c | 1 | ||||
| -rw-r--r-- | libavformat/avio.h | 2 | ||||
| -rw-r--r-- | libavformat/tcp.c | 1 | ||||
| -rw-r--r-- | libavformat/udp.c | 1 | ||||
| -rw-r--r-- | libavformat/url.h | 2 | ||||
| -rw-r--r-- | libavformat/utils.c | 1 |
6 files changed, 8 insertions, 0 deletions
diff --git a/libavformat/applehttp.c b/libavformat/applehttp.c index 9e11fcad12..6c697c50bc 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 41f51aaed4..e9aa49991e 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 c0999832d4..8e380ac374 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 7dad38bc6d..07d1775e96 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 2e1a3f3a72..7482611e11 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 b06fef02bb..da8f3fd3bd 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> |