Merge commit '2dd09ebf5597fd5e4a573bee9cccf21ae821f286'
authorMichael Niedermayer <michaelni@gmx.at>
Wed, 17 Sep 2014 17:59:10 +0000 (19:59 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Wed, 17 Sep 2014 17:59:10 +0000 (19:59 +0200)
commit9ac08d93b2aad6c34987ab68e55bce002c162423
tree61461ca68e99d90c452053eeda6d5dab076d3cb8
parent85f2c0124d898473d8f5bf8223206b7df486dad8
parent2dd09ebf5597fd5e4a573bee9cccf21ae821f286
Merge commit '2dd09ebf5597fd5e4a573bee9cccf21ae821f286'

* commit '2dd09ebf5597fd5e4a573bee9cccf21ae821f286':
  cmdutils: Print a more sensible message in show_filters() w/o libavfilter

Conflicts:
cmdutils.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
cmdutils.c