[FFmpeg-cvslog] Merge commit '2dd09ebf5597fd5e4a573bee9cccf21ae821f286'

Michael Niedermayer git at videolan.org
Wed Sep 17 20:08:22 CEST 2014


ffmpeg | branch: master | Michael Niedermayer <michaelni at 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 <michaelni at gmx.at>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=9ac08d93b2aad6c34987ab68e55bce002c162423
---





More information about the ffmpeg-cvslog mailing list