diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-09-25 10:52:47 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-09-25 10:53:32 +0200 |
| commit | 9b3d4258d9f353662d72f541e5232a8e85450e88 (patch) | |
| tree | f7276b945dd83998846e6ad2d71d15a06bd38e21 /libavcodec | |
| parent | 4a89868c5f9de30bb2eb3709befa33b8440264ec (diff) | |
| parent | 2725f2d40315b56f17c5dffe39dda7d94786302d (diff) | |
| download | ffmpeg-9b3d4258d9f353662d72f541e5232a8e85450e88.tar.gz | |
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>
Diffstat (limited to 'libavcodec')
0 files changed, 0 insertions, 0 deletions