summaryrefslogtreecommitdiff
path: root/avplay.c
diff options
context:
space:
mode:
authorDiego Biurrun <diego@biurrun.de>2014-09-03 00:45:21 +0200
committerDiego Biurrun <diego@biurrun.de>2014-09-06 16:52:59 +0200
commit041caf1a63f091745b95a6d51c23fbdcb604d4ce (patch)
treef8b7138114bc46624ca60de3b76adf63c64850d8 /avplay.c
parent2143948381c8118bdc2f50bd4079520b9885bd54 (diff)
avplay: Exit by default at the end of playback
This is the expected behavior shared by all other cli multimedia players. Bug-Id: 732
Diffstat (limited to 'avplay.c')
-rw-r--r--avplay.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/avplay.c b/avplay.c
index 816733fe43..4a7759bd88 100644
--- a/avplay.c
+++ b/avplay.c
@@ -254,7 +254,7 @@ static enum AVDiscard skip_idct = AVDISCARD_DEFAULT;
static enum AVDiscard skip_loop_filter = AVDISCARD_DEFAULT;
static int error_concealment = 3;
static int decoder_reorder_pts = -1;
-static int autoexit;
+static int noautoexit;
static int exit_on_keydown;
static int exit_on_mousedown;
static int loop = 1;
@@ -2421,7 +2421,7 @@ static int decode_thread(void *arg)
if (is->audioq.size + is->videoq.size + is->subtitleq.size == 0) {
if (loop != 1 && (!loop || --loop)) {
stream_seek(cur_stream, start_time != AV_NOPTS_VALUE ? start_time : 0, 0, 0);
- } else if (autoexit) {
+ } else if (!noautoexit) {
ret = AVERROR_EOF;
goto fail;
}
@@ -2874,7 +2874,7 @@ static const OptionDef options[] = {
{ "idct", OPT_INT | HAS_ARG | OPT_EXPERT, { &idct }, "set idct algo", "algo" },
{ "ec", OPT_INT | HAS_ARG | OPT_EXPERT, { &error_concealment }, "set error concealment options", "bit_mask" },
{ "sync", HAS_ARG | OPT_EXPERT, { .func_arg = opt_sync }, "set audio-video sync. type (type=audio/video/ext)", "type" },
- { "autoexit", OPT_BOOL | OPT_EXPERT, { &autoexit }, "exit at the end", "" },
+ { "noautoexit", OPT_BOOL | OPT_EXPERT, { &noautoexit }, "Do not exit at the end of playback", "" },
{ "exitonkeydown", OPT_BOOL | OPT_EXPERT, { &exit_on_keydown }, "exit on key down", "" },
{ "exitonmousedown", OPT_BOOL | OPT_EXPERT, { &exit_on_mousedown }, "exit on mouse down", "" },
{ "loop", OPT_INT | HAS_ARG | OPT_EXPERT, { &loop }, "set number of times the playback shall be looped", "loop count" },