Michael Niedermayer 9ac08d93b2 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>

2014-09-17 19:59:10 +02:00

65 KiB

Raw Blame History

View Raw