mirror of
https://github.com/FFmpeg/FFmpeg.git
synced 2024-12-23 12:43:46 +02:00
avio: avio_ prefix for url_set_interrupt_cb.
This commit is contained in:
parent
f87b1b373a
commit
80c6e238b0
4
ffmpeg.c
4
ffmpeg.c
@ -2451,7 +2451,7 @@ static int transcode(AVFormatContext **output_files,
|
||||
#else
|
||||
fprintf(stderr, "Press ctrl-c to stop encoding\n");
|
||||
#endif
|
||||
url_set_interrupt_cb(decode_interrupt_cb);
|
||||
avio_set_interrupt_cb(decode_interrupt_cb);
|
||||
}
|
||||
term_init();
|
||||
|
||||
@ -4289,7 +4289,7 @@ int main(int argc, char **argv)
|
||||
|
||||
#if HAVE_ISATTY
|
||||
if(isatty(STDIN_FILENO))
|
||||
url_set_interrupt_cb(decode_interrupt_cb);
|
||||
avio_set_interrupt_cb(decode_interrupt_cb);
|
||||
#endif
|
||||
|
||||
init_opts();
|
||||
|
4
ffplay.c
4
ffplay.c
@ -2393,7 +2393,7 @@ static int decode_thread(void *arg)
|
||||
is->subtitle_stream = -1;
|
||||
|
||||
global_video_state = is;
|
||||
url_set_interrupt_cb(decode_interrupt_cb);
|
||||
avio_set_interrupt_cb(decode_interrupt_cb);
|
||||
|
||||
memset(ap, 0, sizeof(*ap));
|
||||
|
||||
@ -2612,7 +2612,7 @@ static int decode_thread(void *arg)
|
||||
av_close_input_file(is->ic);
|
||||
is->ic = NULL; /* safety */
|
||||
}
|
||||
url_set_interrupt_cb(NULL);
|
||||
avio_set_interrupt_cb(NULL);
|
||||
|
||||
if (ret != 0) {
|
||||
SDL_Event event;
|
||||
|
@ -216,6 +216,10 @@ void url_get_filename(URLContext *h, char *buf, int buf_size)
|
||||
{
|
||||
av_strlcpy(buf, h->filename, buf_size);
|
||||
}
|
||||
void url_set_interrupt_cb(URLInterruptCB *interrupt_cb)
|
||||
{
|
||||
avio_set_interrupt_cb(interrupt_cb);
|
||||
}
|
||||
#endif
|
||||
|
||||
#define URL_SCHEME_CHARS \
|
||||
@ -381,7 +385,7 @@ static int default_interrupt_cb(void)
|
||||
return 0;
|
||||
}
|
||||
|
||||
void url_set_interrupt_cb(URLInterruptCB *interrupt_cb)
|
||||
void avio_set_interrupt_cb(URLInterruptCB *interrupt_cb)
|
||||
{
|
||||
if (!interrupt_cb)
|
||||
interrupt_cb = default_interrupt_cb;
|
||||
|
@ -117,6 +117,7 @@ attribute_deprecated void url_get_filename(URLContext *h, char *buf, int buf_siz
|
||||
attribute_deprecated int av_url_read_pause(URLContext *h, int pause);
|
||||
attribute_deprecated int64_t av_url_read_seek(URLContext *h, int stream_index,
|
||||
int64_t timestamp, int flags);
|
||||
attribute_deprecated void url_set_interrupt_cb(URLInterruptCB *interrupt_cb);
|
||||
#endif
|
||||
|
||||
/**
|
||||
@ -131,7 +132,7 @@ int url_exist(const char *url);
|
||||
* in this case by the interrupted function. 'NULL' means no interrupt
|
||||
* callback is given.
|
||||
*/
|
||||
void url_set_interrupt_cb(URLInterruptCB *interrupt_cb);
|
||||
void avio_set_interrupt_cb(URLInterruptCB *interrupt_cb);
|
||||
|
||||
#if FF_API_OLD_AVIO
|
||||
/* not implemented */
|
||||
|
Loading…
Reference in New Issue
Block a user