Merge commit '921046008f5335601f9d76dc3a768eb5cd91e1b9'
authorMichael Niedermayer <michaelni@gmx.at>
Fri, 12 Apr 2013 14:14:36 +0000 (16:14 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Fri, 12 Apr 2013 14:16:21 +0000 (16:16 +0200)
commit7e68491367ce60af078c0b53069a8011842bcd84
tree57a938592f1afe5e994f15a960c5d69949f0c049
parent608d86013a8663ef5f2fc8c74998750ed2019149
parent921046008f5335601f9d76dc3a768eb5cd91e1b9
Merge commit '921046008f5335601f9d76dc3a768eb5cd91e1b9'

* commit '921046008f5335601f9d76dc3a768eb5cd91e1b9':
  cmdutils: allow -h filter=<name> to print information about a filter.

Conflicts:
cmdutils.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
cmdutils.c
doc/avtools-common-opts.texi