diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-09-17 19:59:10 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-09-17 19:59:10 +0200 |
| commit | 9ac08d93b2aad6c34987ab68e55bce002c162423 (patch) | |
| tree | 61461ca68e99d90c452053eeda6d5dab076d3cb8 /ffplay.c | |
| parent | 85f2c0124d898473d8f5bf8223206b7df486dad8 (diff) | |
| parent | 2dd09ebf5597fd5e4a573bee9cccf21ae821f286 (diff) | |
| download | ffmpeg-9ac08d93b2aad6c34987ab68e55bce002c162423.tar.gz | |
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>
Diffstat (limited to 'ffplay.c')
0 files changed, 0 insertions, 0 deletions