diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-04-12 18:14:36 +0400 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-04-12 18:16:21 +0400 |
| commit | 7e68491367ce60af078c0b53069a8011842bcd84 (patch) | |
| tree | 57a938592f1afe5e994f15a960c5d69949f0c049 /libavfilter/Makefile | |
| parent | 608d86013a8663ef5f2fc8c74998750ed2019149 (diff) | |
| parent | 921046008f5335601f9d76dc3a768eb5cd91e1b9 (diff) | |
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>
Diffstat (limited to 'libavfilter/Makefile')
0 files changed, 0 insertions, 0 deletions