Revision 026e1757

View differences:

libavformat/avio.c
49 49
static int default_interrupt_cb(void);
50 50

  
51 51
URLProtocol *first_protocol = NULL;
52
URLInterruptCB *url_interrupt_cb = default_interrupt_cb;
52
int (*url_interrupt_cb)(void) = default_interrupt_cb;
53 53

  
54 54
URLProtocol *av_protocol_next(URLProtocol *p)
55 55
{
......
389 389
    return 0;
390 390
}
391 391

  
392
void avio_set_interrupt_cb(URLInterruptCB *interrupt_cb)
392
void avio_set_interrupt_cb(int (*interrupt_cb)(void))
393 393
{
394 394
    if (!interrupt_cb)
395 395
        interrupt_cb = default_interrupt_cb;
libavformat/avio.h
90 90
 * silently ignored.
91 91
 */
92 92
#define URL_FLAG_NONBLOCK 4
93
#endif
94 93

  
95 94
typedef int URLInterruptCB(void);
96 95

  
97
#if FF_API_OLD_AVIO
98 96
/**
99 97
 * @defgroup old_url_funcs Old url_* functions
100 98
 * @deprecated use the buffered API based on AVIOContext instead
......
117 115
attribute_deprecated int av_url_read_pause(URLContext *h, int pause);
118 116
attribute_deprecated int64_t av_url_read_seek(URLContext *h, int stream_index,
119 117
                                              int64_t timestamp, int flags);
120
attribute_deprecated void url_set_interrupt_cb(URLInterruptCB *interrupt_cb);
118
attribute_deprecated void url_set_interrupt_cb(int (*interrupt_cb)(void));
121 119
#endif
122 120

  
123 121
/**
......
132 130
 * in this case by the interrupted function. 'NULL' means no interrupt
133 131
 * callback is given.
134 132
 */
135
void avio_set_interrupt_cb(URLInterruptCB *interrupt_cb);
133
void avio_set_interrupt_cb(int (*interrupt_cb)(void));
136 134

  
137 135
#if FF_API_OLD_AVIO
138 136
/* not implemented */
libavformat/url.h
31 31
#if !FF_API_OLD_AVIO
32 32
#define URL_PROTOCOL_FLAG_NESTED_SCHEME 1 /*< The protocol name can be the first part of a nested protocol scheme */
33 33

  
34
extern URLInterruptCB *url_interrupt_cb;
34
extern int (*url_interrupt_cb)(void);
35 35
#endif
36 36

  
37 37
/**

Also available in: Unified diff