mirror of
https://github.com/xenia-project/FFmpeg.git
synced 2025-02-12 15:28:15 +00:00
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@gmx.at>
This commit is contained in:
commit
9b3d4258d9