ffmpeg: stop protocols on interrupt when no transcoding has happened yet
Fixes Ticket3344 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
parent
ecb80fe78c
commit
517cc81e93
5
ffmpeg.c
5
ffmpeg.c
@ -316,6 +316,7 @@ void term_exit(void)
|
|||||||
|
|
||||||
static volatile int received_sigterm = 0;
|
static volatile int received_sigterm = 0;
|
||||||
static volatile int received_nb_signals = 0;
|
static volatile int received_nb_signals = 0;
|
||||||
|
static volatile int transcode_init_done = 0;
|
||||||
static int main_return_code = 0;
|
static int main_return_code = 0;
|
||||||
|
|
||||||
static void
|
static void
|
||||||
@ -422,7 +423,7 @@ static int read_key(void)
|
|||||||
|
|
||||||
static int decode_interrupt_cb(void *ctx)
|
static int decode_interrupt_cb(void *ctx)
|
||||||
{
|
{
|
||||||
return received_nb_signals > 1;
|
return received_nb_signals > transcode_init_done;
|
||||||
}
|
}
|
||||||
|
|
||||||
const AVIOInterruptCB int_cb = { decode_interrupt_cb, NULL };
|
const AVIOInterruptCB int_cb = { decode_interrupt_cb, NULL };
|
||||||
@ -2889,6 +2890,8 @@ static int transcode_init(void)
|
|||||||
print_sdp();
|
print_sdp();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
transcode_init_done = 1;
|
||||||
|
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
Loading…
x
Reference in New Issue
Block a user