diff options
author | Uoti Urpala <uau@glyph.nonexistent.invalid> | 2008-10-02 05:17:23 +0300 |
---|---|---|
committer | Uoti Urpala <uau@glyph.nonexistent.invalid> | 2008-10-02 05:17:23 +0300 |
commit | ebb4abf2081026c63bb5c983f76447d9d2413656 (patch) | |
tree | f2b3ed868645fd2546173be3500f4c3e0cdf3ecc /input | |
parent | 849dc0ba31f209dfdb48146512e48ee2203d0ee6 (diff) | |
parent | 20571d6f6870dab84624cc6b6fbac82cde204f16 (diff) | |
download | mpv-ebb4abf2081026c63bb5c983f76447d9d2413656.tar.bz2 mpv-ebb4abf2081026c63bb5c983f76447d9d2413656.tar.xz |
Merge svn changes up to r27682
Addition of the "outdir" suboption to vo_png in svn was reverted
before merging.
Conflicts:
command.c
mplayer.c
Diffstat (limited to 'input')
-rw-r--r-- | input/input.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/input/input.c b/input/input.c index 3802957178..3e917afa49 100644 --- a/input/input.c +++ b/input/input.c @@ -762,6 +762,9 @@ mp_input_parse_cmd(char* str) { } else if (strncmp(str, "pausing_toggle ", 15) == 0) { pausing = 3; str = &str[15]; + } else if (strncmp(str, "pausing_keep_force ", 19) == 0) { + pausing = 4; + str = &str[19]; } for(ptr = str ; ptr[0] != '\0' && ptr[0] != '\t' && ptr[0] != ' ' ; ptr++) |