[Bash-completion-commits] [SCM] bash-completion branch, master, updated. 35ac650e306fab403dad34171e953f08874a4fa7

[Ville Skyttä]

The following commit has been merged in the master branch:
commit 729f6c4ea31709fb5b0e582bc74c2e10b38c50f1
Author: Ville Skyttä <ville.skytta at iki.fi>
Date:   Tue Sep 28 18:50:38 2010 +0300

    Add mplayer -audio-demuxer and -sub-demuxer completions.

diff --git a/CHANGES b/CHANGES
index 6ccae2c..962deda 100644
--- a/CHANGES
+++ b/CHANGES
@@ -24,6 +24,7 @@ bash-completion (2.x)
     filename extension arguments in addition to exact case matches.
   * Fix known hosts completion for IPv6 addresses whose last 16 bits are digits
     (Alioth: #312695, RedHat: #630658).
+  * Improve mplayer and mencoder completions.
 
   [ Freddy Vulto ]
   * Added _tilde(), fix ~username completion (Alioth: #312613, Debian: #587095)
diff --git a/completions/mplayer b/completions/mplayer
index 7e4c557..c71c677 100644
--- a/completions/mplayer
+++ b/completions/mplayer
@@ -18,7 +18,8 @@ _mplayer()
     _get_comp_words_by_ref cur prev
 
     case $prev in
-        -[av][cfo]|-[av]fm|-vop|-fstype|-demuxer|-o[av]c|-of|-profile)
+        -[av][cfo]|-[av]fm|-vop|-fstype|-demuxer|-o[av]c|-of|-profile| \
+        -audio-demuxer|-sub-demuxer)
             _mplayer_options_list $cmd $prev
             return 0
             ;;
@@ -97,7 +98,7 @@ _mplayer()
             return 0
             ;;
         -autoq|-autosync|-loop|-menu-root|-speed|-sstep|-aid|-alang| \
-        -audo-demuxer|-sub-demuxer|-demuxer|-bandwidth|-cache|-chapter| \
+        -demuxer|-bandwidth|-cache|-chapter| \
         -dvd|-dvdangle|-fps|-frames|-mc|-passwd|-user|-sb|-srate|-ss|-vcd| \
         -vi|-vid|-vivo|-ffactor|-sid|-slang|-spualign|-spuaa|-spugauss| \
         -vobsubid|-delay|-bpp|-brightness|-contrast|-dfbopts|-display| \

-- 
bash-completion