Commit 5cec8971 authored by Anton Khirnov's avatar Anton Khirnov

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

parent 8e76a19b
...@@ -31,6 +31,7 @@ ...@@ -31,6 +31,7 @@
#include "internal.h" #include "internal.h"
#include <unistd.h> #include <unistd.h>
#include "avio_internal.h" #include "avio_internal.h"
#include "url.h"
#define INITIAL_BUFFER_SIZE 32768 #define INITIAL_BUFFER_SIZE 32768
......
...@@ -163,7 +163,9 @@ typedef struct URLProtocol { ...@@ -163,7 +163,9 @@ typedef struct URLProtocol {
extern URLProtocol *first_protocol; extern URLProtocol *first_protocol;
#endif #endif
#if FF_API_OLD_AVIO
extern URLInterruptCB *url_interrupt_cb; extern URLInterruptCB *url_interrupt_cb;
#endif
/** /**
* If protocol is NULL, returns the first registered protocol, * If protocol is NULL, returns the first registered protocol,
......
...@@ -24,6 +24,7 @@ ...@@ -24,6 +24,7 @@
#include "internal.h" #include "internal.h"
#include "network.h" #include "network.h"
#include "os_support.h" #include "os_support.h"
#include "url.h"
#if HAVE_POLL_H #if HAVE_POLL_H
#include <poll.h> #include <poll.h>
#endif #endif
......
...@@ -33,6 +33,7 @@ ...@@ -33,6 +33,7 @@
#include "internal.h" #include "internal.h"
#include "network.h" #include "network.h"
#include "os_support.h" #include "os_support.h"
#include "url.h"
#include <sys/time.h> #include <sys/time.h>
#ifndef IPV6_ADD_MEMBERSHIP #ifndef IPV6_ADD_MEMBERSHIP
......
...@@ -30,6 +30,8 @@ ...@@ -30,6 +30,8 @@
#if !FF_API_OLD_AVIO #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 */ #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 #endif
/** /**
......
...@@ -31,6 +31,7 @@ ...@@ -31,6 +31,7 @@
#include "libavutil/avstring.h" #include "libavutil/avstring.h"
#include "riff.h" #include "riff.h"
#include "audiointerleave.h" #include "audiointerleave.h"
#include "url.h"
#include <sys/time.h> #include <sys/time.h>
#include <time.h> #include <time.h>
#include <strings.h> #include <strings.h>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment