Merge commit 'fb238f8230c1b0314985482207add548c68f83cf'

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

Merged-by: Michael Niedermayer <michaelni@gmx.at>
pull/89/head
Michael Niedermayer 10 years ago
commit 83a897656a
  1. 2
      libavformat/url.h

@ -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 {

Loading…
Cancel
Save