mirror of https://git.ffmpeg.org/ffmpeg.git
Merge commit '2725f2d40315b56f17c5dffe39dda7d94786302d'
* commit '2725f2d40315b56f17c5dffe39dda7d94786302d':
doc/filters: fix an option name in the unsharp docs
Conflicts:
doc/filters.texi
See: b7b72963e0
Merged-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
commit
9b3d4258d9