From 40972f7c54e013d2da8bf42cb34ab25cfea75eab Mon Sep 17 00:00:00 2001 From: Martin Storsjö Date: Sun, 6 Nov 2011 23:28:49 +0200 Subject: avplay: Set the new interrupt callback Signed-off-by: Anton Khirnov --- avplay.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'avplay.c') diff --git a/avplay.c b/avplay.c index 01c0f118e9..556c463aec 100644 --- a/avplay.c +++ b/avplay.c @@ -2339,7 +2339,7 @@ static void stream_component_close(VideoState *is, int stream_index) variable instead of a thread local variable */ static VideoState *global_video_state; -static int decode_interrupt_cb(void) +static int decode_interrupt_cb(void *ctx) { return (global_video_state && global_video_state->abort_request); } @@ -2364,8 +2364,9 @@ static int decode_thread(void *arg) is->subtitle_stream = -1; global_video_state = is; - avio_set_interrupt_cb(decode_interrupt_cb); + ic = avformat_alloc_context(); + ic->interrupt_callback.callback = decode_interrupt_cb; err = avformat_open_input(&ic, is->filename, is->iformat, &format_opts); if (err < 0) { print_error(is->filename, err); -- cgit v1.2.3