[FFmpeg-cvslog] Merge commit '2725f2d40315b56f17c5dffe39dda7d94786302d'

Michael Niedermayer git at videolan.org
Wed Sep 25 11:13:13 CEST 2013


ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Wed Sep 25 10:52:47 2013 +0200| [9b3d4258d9f353662d72f541e5232a8e85450e88] | committer: Michael Niedermayer

Merge commit '2725f2d40315b56f17c5dffe39dda7d94786302d'

* commit '2725f2d40315b56f17c5dffe39dda7d94786302d':
  doc/filters: fix an option name in the unsharp docs

Conflicts:
	doc/filters.texi

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

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





More information about the ffmpeg-cvslog mailing list