summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2013-07-30 11:26:39 +0200
committerMichael Niedermayer <michaelni@gmx.at>2013-07-30 11:26:39 +0200
commitc7d17179571daa875083e2fe72c498ae47772d75 (patch)
tree63c60576f671d518e272fdca55d5371db82f7d35
parent5fae4678949b2a24225c152867ebd97c4918dc53 (diff)
parent0e8c6f221a8ddb7dfb3c9e9bd0b33cb12e9391b8 (diff)
Merge commit '0e8c6f221a8ddb7dfb3c9e9bd0b33cb12e9391b8'
* commit '0e8c6f221a8ddb7dfb3c9e9bd0b33cb12e9391b8': avisynth: Fix a "AVISynth" vs. "AviSynth" struct name typo Conflicts: doc/general.texi libavformat/avisynth.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
-rw-r--r--doc/general.texi2
-rw-r--r--libavfilter/vf_gradfun.c2
2 files changed, 2 insertions, 2 deletions
diff --git a/doc/general.texi b/doc/general.texi
index 2aa7d5a58f..3d6bf78640 100644
--- a/doc/general.texi
+++ b/doc/general.texi
@@ -168,7 +168,7 @@ library:
@item AST @tab X @tab X
@tab Audio format used on the Nintendo Wii.
@item AVI @tab X @tab X
-@item AVISynth @tab @tab X
+@item AviSynth @tab @tab X
@item AVR @tab @tab X
@tab Audio format used on Mac.
@item AVS @tab @tab X
diff --git a/libavfilter/vf_gradfun.c b/libavfilter/vf_gradfun.c
index f9dec77185..e615e1e592 100644
--- a/libavfilter/vf_gradfun.c
+++ b/libavfilter/vf_gradfun.c
@@ -25,7 +25,7 @@
* libmpcodecs/vf_gradfun.c
*
* Apply a boxblur debanding algorithm (based on the gradfun2db
- * Avisynth filter by prunedtree).
+ * AviSynth filter by prunedtree).
* Foreach pixel, if it's within threshold of the blurred value, make it closer.
* So now we have a smoothed and higher bitdepth version of all the shallow
* gradients, while leaving detailed areas untouched.