diff options
author | Frank Terbeck <ft@bewatermyfriend.org> | 2011-12-01 10:02:04 +0100 |
---|---|---|
committer | Frank Terbeck <ft@bewatermyfriend.org> | 2011-12-01 10:02:04 +0100 |
commit | d8da5ea2f2bc5f837d0b364fff2636ebdb2f90ca (patch) | |
tree | 9fd9a57486ac4702608d92088ffd91f52971244f /Completion/X/Command/_mplayer | |
parent | af2bb4fdb09414d21922d3fafe4e3a0ac1332f01 (diff) | |
parent | 9d71f4c207fb34e8d64af0443c83231b1cc3b494 (diff) | |
download | zsh-d8da5ea2f2bc5f837d0b364fff2636ebdb2f90ca.tar.gz zsh-d8da5ea2f2bc5f837d0b364fff2636ebdb2f90ca.zip |
Merge commit 'zsh-4.3.13' into debian
Diffstat (limited to 'Completion/X/Command/_mplayer')
-rw-r--r-- | Completion/X/Command/_mplayer | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/Completion/X/Command/_mplayer b/Completion/X/Command/_mplayer index d3d1e6046..85c4f6d12 100644 --- a/Completion/X/Command/_mplayer +++ b/Completion/X/Command/_mplayer @@ -77,7 +77,7 @@ _x_arguments -C -s \ '-sid[turn on DVD subtitles]:language id' \ '-speed[set playback speed rate]:playback speed rate' \ '-srate[specify frequency of audio playback]:frequency (Hz)' \ - '-ss[seek to given time position]:position (hh:mm\[\:ss\])' \ + '-ss[seek to given time position]:position ([[hh\:]mm\:]ss[.sss])' \ '-sstep[specify time between displayed frames]:time (seconds)' \ -ssf:mode -stop_xscreensaver \ '-stereo:mode:((0\:stereo 1\:left\ channel 2\:right\ channel))' \ @@ -108,14 +108,14 @@ _x_arguments -C -s \ '-z[specify compression level for png output]:compression-level:((0\:no\ compression 1 2 3 4 5 6\:default\ compression 7 8 9\:max\ compression))' \ '-zoom[use software scaling, where available (use with -nofs)]' \ -zrbw -zrcrop -zrdev -zrfd -zrhelp -zrnorm -zrquality -zr{h,v}dec -zr{x,y}doff \ - '(-use-stdin)*:video file:->mfiles' + '(-use-stdin)*:video file:->mfiles' && ret=0 case "$state" in mfiles) _tags files urls while _tags; do _requested files expl 'video file' _files -g \ - "*.(#i)(asf|asx|avi|flac|flv|m1v|m2p|m2v|mjpg|mka|mkv|mov|mp3|mp4|mpe|mpeg|mpg|ogg|ogm|qt|rm|vob|wav|wma|wmv)(-.)" && ret=0 + "*.(#i)(asf|asx|avi|flac|flv|m1v|m2p|m2v|m4v|mjpg|mka|mkv|mov|mp3|mp4|mpe|mpeg|mpg|ogg|ogm|qt|rm|vob|wav|webm|wma|wmv)(-.)" && ret=0 if _requested urls; then while _next_label urls expl URL; do _urls "$expl[@]" && ret=0 |