diff options
| -rw-r--r-- | ChangeLog | 7 | ||||
| -rw-r--r-- | Completion/Unix/Command/_ffmpeg | 10 |
2 files changed, 11 insertions, 6 deletions
diff --git a/ChangeLog b/ChangeLog index 777cf8dc1..7bb240412 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2010-09-16 Peter Stephenson <pws@csr.com> + + * Baptiste: 28264: Completion/Unix/Command/_ffmpeg: remove the + need for sed. + 2010-09-15 Wayne Davison <wayned@users.sourceforge.net> * 28261: Julius Plenz: Completion/Debian/_dpkg: separate the @@ -13651,5 +13656,5 @@ ***************************************************** * This is used by the shell to define $ZSH_PATCHLEVEL -* $Revision: 1.5082 $ +* $Revision: 1.5083 $ ***************************************************** diff --git a/Completion/Unix/Command/_ffmpeg b/Completion/Unix/Command/_ffmpeg index 7c0660ed1..1c57e3b9c 100644 --- a/Completion/Unix/Command/_ffmpeg +++ b/Completion/Unix/Command/_ffmpeg @@ -18,24 +18,24 @@ _ffmpeg_presets() { _ffmpeg_acodecs() { local acodecs - acodecs=($(ffmpeg -codecs 2>/dev/null | sed -n '/^ .[E ]A/ {s/^ .......//; s/ .*//p;}')) + acodecs=(${${(M)${(f)"$(ffmpeg -codecs 2>/dev/null)"}:#[[:space:]][D[:space:]][E[:space:]]A[S[:space:]][D[:space:]][T[:space:]][[:space:]][^[:space:]]##*}//(#b)????????([^[:space:]]##)*/$match[1]}) _ffmpeg_compadd 'force audio codec (''copy'' to copy stream)' acodecs '' } _ffmpeg_vcodecs() { local vcodecs - vcodecs=($(ffmpeg -codecs 2>/dev/null | sed -n '/^ .[E ]V/ {s/^ .......//; s/ .*//p;}')) + vcodecs=(${${(M)${(f)"$(ffmpeg -codecs 2>/dev/null)"}:#[[:space:]][D[:space:]][E[:space:]]V[S[:space:]][D[:space:]][T[:space:]][[:space:]][^[:space:]]##*}//(#b)????????([^[:space:]]##)*/$match[1]}) _ffmpeg_compadd 'force video codec (''copy'' to copy stream)' vcodecs '' } _ffmpeg_formats() { local formats - formats=($(ffmpeg -formats 2>/dev/null | sed -e '1,/--/d' -e 's/^....//' -e 's/ .*//' | tr , '\n' | sort | uniq)) + formats=(${(ou)${=${(s:,:)${${(M)${(f)"$(ffmpeg -formats 2>/dev/null)"}:#[[:space:]][D[:space:]][E[:space:]][[:space:]][^[:space:]]##*}//(#b)????([^[:space:]]##)*/$match[1]}}}}) _ffmpeg_compadd 'force format' formats '' } _ffmpeg_list_pix_fmts() { - ffmpeg -pix_fmts 2>/dev/null | sed -e '1,/-----/d' -e 's/^......//' -e 's/ .*//' + print -l ${${(M)${(f)"$(ffmpeg -pix_fmts 2>/dev/null)"}:#[I.]*}//(#b)??????([^[:space:]]##)*/$match[1]} } _ffmpeg_pix_fmts() { @@ -46,7 +46,7 @@ _ffmpeg_pix_fmts() { _ffmpeg_bsfs() { local bsfs - bsfs=($(ffmpeg -bsfs 2>/dev/null | sed 1d)) + bsfs=(${${(f)"$(ffmpeg -bsfs 2>/dev/null)"}:#*:}) _ffmpeg_compadd 'set bitstream filter' bsfs '' } |