[FFmpeg-cvslog] Merge commit '921046008f5335601f9d76dc3a768eb5cd91e1b9'

Michael Niedermayer git at videolan.org
Fri Apr 12 16:21:50 CEST 2013


ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Fri Apr 12 16:14:36 2013 +0200| [7e68491367ce60af078c0b53069a8011842bcd84] | committer: Michael Niedermayer

Merge commit '921046008f5335601f9d76dc3a768eb5cd91e1b9'

* commit '921046008f5335601f9d76dc3a768eb5cd91e1b9':
  cmdutils: allow -h filter=<name> to print information about a filter.

Conflicts:
	cmdutils.c

Merged-by: Michael Niedermayer <michaelni at gmx.at>

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





More information about the ffmpeg-cvslog mailing list