1
0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-12-23 12:43:46 +02:00

Merge commit 'fb238f8230c1b0314985482207add548c68f83cf'

* commit 'fb238f8230c1b0314985482207add548c68f83cf':
  urlprotocol: remove unused url_interrupt_cb declaration

Merged-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer 2014-10-18 12:15:50 +02:00
commit 83a897656a

View File

@ -34,8 +34,6 @@
#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 */
#define URL_PROTOCOL_FLAG_NETWORK 2 /*< The protocol uses network */ #define URL_PROTOCOL_FLAG_NETWORK 2 /*< The protocol uses network */
extern int (*url_interrupt_cb)(void);
extern const AVClass ffurl_context_class; extern const AVClass ffurl_context_class;
typedef struct URLContext { typedef struct URLContext {