aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorCarl Eugen Hoyos <cehoyos@ag.or.at>2014-09-08 17:51:12 +0200
committerCarl Eugen Hoyos <cehoyos@ag.or.at>2014-09-08 17:51:12 +0200
commit552ce6874c8a6798edb17b685472aebb86381caa (patch)
tree5bea651babd091e9651672fb7897eec6583f05cb
parent42b4da75b73d79e7323512bcfb7fe32ab0b24178 (diff)
downloadffmpeg-552ce6874c8a6798edb17b685472aebb86381caa.tar.gz
Revert the default for ffplay to -noautoexit.
Reviewed-by: Marton Balint
-rw-r--r--Changelog1
-rw-r--r--RELEASE_NOTES1
-rw-r--r--ffplay.c2
3 files changed, 1 insertions, 3 deletions
diff --git a/Changelog b/Changelog
index 1ec2d8c41a..c5185f7eec 100644
--- a/Changelog
+++ b/Changelog
@@ -14,7 +14,6 @@ version <next>:
- Matroska 3D support thorugh side data
- HTML generation using texi2html is deprecated in favor of makeinfo/texi2any
- silenceremove filter
-- ffplay now exits by default at the end of playback
version 2.3:
diff --git a/RELEASE_NOTES b/RELEASE_NOTES
index d5bd6d75cf..113cc5e97d 100644
--- a/RELEASE_NOTES
+++ b/RELEASE_NOTES
@@ -59,4 +59,3 @@
• libmodplug is now detected through pkg-config
• HTML documentation generation through texi2html is deprecated in
favor of makeinfo/texi2any
- • ffplay now exits by default at the end of playback
diff --git a/ffplay.c b/ffplay.c
index 06bccce45e..833b5b12cf 100644
--- a/ffplay.c
+++ b/ffplay.c
@@ -311,7 +311,7 @@ static int fast = 0;
static int genpts = 0;
static int lowres = 0;
static int decoder_reorder_pts = -1;
-static int autoexit = 1;
+static int autoexit;
static int exit_on_keydown;
static int exit_on_mousedown;
static int loop = 1;