har0ke/FFmpeg
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

avio: avio_ prefix for url_set_interrupt_cb.

Browse Source
This commit is contained in:
Anton Khirnov 2011-04-04 20:15:44 +02:00
parent f87b1b373a
commit 80c6e238b0
4 changed files with 11 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
ffmpeg.c
View File

@ -2451,7 +2451,7 @@ static int transcode(AVFormatContext **output_files,
#else #else
fprintf(stderr, "Press ctrl-c to stop encoding\n"); fprintf(stderr, "Press ctrl-c to stop encoding\n");
#endif #endif
url_set_interrupt_cb(decode_interrupt_cb); avio_set_interrupt_cb(decode_interrupt_cb);
} }
term_init(); term_init();
@ -4289,7 +4289,7 @@ int main(int argc, char **argv)
#if HAVE_ISATTY #if HAVE_ISATTY
if(isatty(STDIN_FILENO)) if(isatty(STDIN_FILENO))
url_set_interrupt_cb(decode_interrupt_cb); avio_set_interrupt_cb(decode_interrupt_cb);
#endif #endif
init_opts(); init_opts();

4
ffplay.c
View File

@ -2393,7 +2393,7 @@ static int decode_thread(void *arg)
is->subtitle_stream = -1; is->subtitle_stream = -1;
global_video_state = is; global_video_state = is;
url_set_interrupt_cb(decode_interrupt_cb); avio_set_interrupt_cb(decode_interrupt_cb);
memset(ap, 0, sizeof(*ap)); memset(ap, 0, sizeof(*ap));
@ -2612,7 +2612,7 @@ static int decode_thread(void *arg)
av_close_input_file(is->ic); av_close_input_file(is->ic);
is->ic = NULL; /* safety */ is->ic = NULL; /* safety */
} }
url_set_interrupt_cb(NULL); avio_set_interrupt_cb(NULL);
if (ret != 0) { if (ret != 0) {
SDL_Event event; SDL_Event event;

6
libavformat/avio.c
View File

@ -216,6 +216,10 @@ void url_get_filename(URLContext *h, char *buf, int buf_size)
{ {
av_strlcpy(buf, h->filename, buf_size); av_strlcpy(buf, h->filename, buf_size);
} }
void url_set_interrupt_cb(URLInterruptCB *interrupt_cb)
{
avio_set_interrupt_cb(interrupt_cb);
}
#endif #endif
#define URL_SCHEME_CHARS \ #define URL_SCHEME_CHARS \
@ -381,7 +385,7 @@ static int default_interrupt_cb(void)
return 0; return 0;
} }
void url_set_interrupt_cb(URLInterruptCB *interrupt_cb) void avio_set_interrupt_cb(URLInterruptCB *interrupt_cb)
{ {
if (!interrupt_cb) if (!interrupt_cb)
interrupt_cb = default_interrupt_cb; interrupt_cb = default_interrupt_cb;

3
libavformat/avio.h
View File

@ -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 int av_url_read_pause(URLContext *h, int pause);
attribute_deprecated int64_t av_url_read_seek(URLContext *h, int stream_index, attribute_deprecated int64_t av_url_read_seek(URLContext *h, int stream_index,
int64_t timestamp, int flags); int64_t timestamp, int flags);
attribute_deprecated void url_set_interrupt_cb(URLInterruptCB *interrupt_cb);
#endif #endif
/** /**
@ -131,7 +132,7 @@ int url_exist(const char *url);
* in this case by the interrupted function. 'NULL' means no interrupt * in this case by the interrupted function. 'NULL' means no interrupt
* callback is given. * callback is given.
*/ */
void url_set_interrupt_cb(URLInterruptCB *interrupt_cb); void avio_set_interrupt_cb(URLInterruptCB *interrupt_cb);
#if FF_API_OLD_AVIO #if FF_API_OLD_AVIO
/* not implemented */ /* not implemented */