-
Michael Niedermayer authored
* commit '2dd09ebf': cmdutils: Print a more sensible message in show_filters() w/o libavfilter Conflicts: cmdutils.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
9ac08d93
* commit '2dd09ebf': cmdutils: Print a more sensible message in show_filters() w/o libavfilter Conflicts: cmdutils.c Merged-by: Michael Niedermayer <michaelni@gmx.at>