ffmpeg | branch: master | Michael Niedermayer <michae...@gmx.at> | Wed Sep 17
19:59:10 2014 +0200| [9ac08d93b2aad6c34987ab68e55bce002c162423] | committer:
Michael Niedermayer
Merge commit '2dd09ebf5597fd5e4a573bee9cccf21ae821f286'
* commit '2dd09ebf5597fd5e4a573bee9cccf21ae821f286':
cmdutils: Print a more sensible message in show_filters() w/o libavfilter
Conflicts:
cmdutils.c
Merged-by: Michael Niedermayer <michae...@gmx.at>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=9ac08d93b2aad6c34987ab68e55bce002c162423
---
_______________________________________________
ffmpeg-cvslog mailing list
ffmpeg-cvslog@ffmpeg.org
http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog
