On Wed, Sep 3, 2014 at 6:56 AM, Diego Biurrun <[email protected]> wrote:
> This is the expected behavior shared by all other cli multimedia players.
>
> Bug-Id: 732
> ---
> Changelog | 4 ++++
> avplay.c | 6 +++---
> doc/avplay.texi | 4 ++--
> 3 files changed, 9 insertions(+), 5 deletions(-)
>
> diff --git a/Changelog b/Changelog
> index 98f3be1..e7428c4 100644
> --- a/Changelog
> +++ b/Changelog
> @@ -1,6 +1,10 @@
> Entries are sorted chronologically from oldest to youngest within each
> release,
> releases are sorted from youngest to oldest.
>
> +version <next>:
> +- avplay now exits by default at the end of playback
> +
> +
> version 11:
> - libx265 encoder
> - shuffleplanes filter
> diff --git a/avplay.c b/avplay.c
> index 816733f..4a7759b 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" },
> diff --git a/doc/avplay.texi b/doc/avplay.texi
> index 71981f6..122d461 100644
> --- a/doc/avplay.texi
> +++ b/doc/avplay.texi
> @@ -109,8 +109,8 @@ Select the desired subtitle stream number, counting from
> 0. The number
> refers to the list of all the input subtitle streams. If it is greater
> than the number of subtitle streams minus one, then the last one is
> selected, if it is negative the subtitle rendering is disabled.
> -@item -autoexit
> -Exit when video is done playing.
> +@item -noautoexit
> +Do not exit when the video is done playing.
> @item -exitonkeydown
> Exit if any key is pressed.
> @item -exitonmousedown
> --
LGTM, and please include in release/11.
--
regards,
Reinhard
_______________________________________________
libav-devel mailing list
[email protected]
https://lists.libav.org/mailman/listinfo/libav-devel
