Revision 80c6e238

View differences:

ffmpeg.c
2451 2451
#else
2452 2452
        fprintf(stderr, "Press ctrl-c to stop encoding\n");
2453 2453
#endif
2454
        url_set_interrupt_cb(decode_interrupt_cb);
2454
        avio_set_interrupt_cb(decode_interrupt_cb);
2455 2455
    }
2456 2456
    term_init();
2457 2457

  
......
4289 4289

  
4290 4290
#if HAVE_ISATTY
4291 4291
    if(isatty(STDIN_FILENO))
4292
        url_set_interrupt_cb(decode_interrupt_cb);
4292
        avio_set_interrupt_cb(decode_interrupt_cb);
4293 4293
#endif
4294 4294

  
4295 4295
    init_opts();
ffplay.c
2393 2393
    is->subtitle_stream = -1;
2394 2394

  
2395 2395
    global_video_state = is;
2396
    url_set_interrupt_cb(decode_interrupt_cb);
2396
    avio_set_interrupt_cb(decode_interrupt_cb);
2397 2397

  
2398 2398
    memset(ap, 0, sizeof(*ap));
2399 2399

  
......
2612 2612
        av_close_input_file(is->ic);
2613 2613
        is->ic = NULL; /* safety */
2614 2614
    }
2615
    url_set_interrupt_cb(NULL);
2615
    avio_set_interrupt_cb(NULL);
2616 2616

  
2617 2617
    if (ret != 0) {
2618 2618
        SDL_Event event;
libavformat/avio.c
216 216
{
217 217
    av_strlcpy(buf, h->filename, buf_size);
218 218
}
219
void url_set_interrupt_cb(URLInterruptCB *interrupt_cb)
220
{
221
    avio_set_interrupt_cb(interrupt_cb);
222
}
219 223
#endif
220 224

  
221 225
#define URL_SCHEME_CHARS                        \
......
381 385
    return 0;
382 386
}
383 387

  
384
void url_set_interrupt_cb(URLInterruptCB *interrupt_cb)
388
void avio_set_interrupt_cb(URLInterruptCB *interrupt_cb)
385 389
{
386 390
    if (!interrupt_cb)
387 391
        interrupt_cb = default_interrupt_cb;
libavformat/avio.h
117 117
attribute_deprecated int av_url_read_pause(URLContext *h, int pause);
118 118
attribute_deprecated int64_t av_url_read_seek(URLContext *h, int stream_index,
119 119
                                              int64_t timestamp, int flags);
120
attribute_deprecated void url_set_interrupt_cb(URLInterruptCB *interrupt_cb);
120 121
#endif
121 122

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

  
136 137
#if FF_API_OLD_AVIO
137 138
/* not implemented */

Also available in: Unified diff