aboutsummaryrefslogtreecommitdiffstats
path: root/ffmpeg.c
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2014-04-10 22:23:54 +0200
committerMichael Niedermayer <michaelni@gmx.at>2014-04-10 22:29:23 +0200
commit517cc81e939fce89c265e8edfef06e44cc362b73 (patch)
tree72998545552da4904975eb7e32747b4ff36d6489 /ffmpeg.c
parentecb80fe78c5890e9ea98129f27e44c309aaa2fce (diff)
downloadffmpeg-517cc81e939fce89c265e8edfef06e44cc362b73.tar.gz
ffmpeg: stop protocols on interrupt when no transcoding has happened yet
Fixes Ticket3344 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'ffmpeg.c')
-rw-r--r--ffmpeg.c5
1 files changed, 4 insertions, 1 deletions
diff --git a/ffmpeg.c b/ffmpeg.c
index 28507462aa..051e279763 100644
--- a/ffmpeg.c
+++ b/ffmpeg.c
@@ -316,6 +316,7 @@ void term_exit(void)
static volatile int received_sigterm = 0;
static volatile int received_nb_signals = 0;
+static volatile int transcode_init_done = 0;
static int main_return_code = 0;
static void
@@ -422,7 +423,7 @@ static int read_key(void)
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 };
@@ -2889,6 +2890,8 @@ static int transcode_init(void)
print_sdp();
}
+ transcode_init_done = 1;
+
return 0;
}