summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEzio Melotti <ezio.melotti@gmail.com>2012-12-14 18:20:07 (GMT)
committerEzio Melotti <ezio.melotti@gmail.com>2012-12-14 18:20:07 (GMT)
commite0a908290cc7226d441cbf595a2643ad4508f61c (patch)
tree2a3b88511c0593289c9c0ec9395bc6ddd753a1ad
parent752f5dd0f747b6ead2f72c6cc8b12dc463570c64 (diff)
parent30505413df61f1cd7d550d6b90e08e691c62479a (diff)
downloadcpython-e0a908290cc7226d441cbf595a2643ad4508f61c.zip
cpython-e0a908290cc7226d441cbf595a2643ad4508f61c.tar.gz
cpython-e0a908290cc7226d441cbf595a2643ad4508f61c.tar.bz2
#16683: merge with 3.3.
-rw-r--r--Doc/library/audioop.rst12
1 files changed, 6 insertions, 6 deletions
diff --git a/Doc/library/audioop.rst b/Doc/library/audioop.rst
index 198c11a..51391ef 100644
--- a/Doc/library/audioop.rst
+++ b/Doc/library/audioop.rst
@@ -156,12 +156,6 @@ The module defines the following variables and functions:
hardware, among others.
-.. function:: minmax(fragment, width)
-
- Return a tuple consisting of the minimum and maximum values of all samples in
- the sound fragment.
-
-
.. function:: max(fragment, width)
Return the maximum of the *absolute value* of all samples in a fragment.
@@ -172,6 +166,12 @@ The module defines the following variables and functions:
Return the maximum peak-peak value in the sound fragment.
+.. function:: minmax(fragment, width)
+
+ Return a tuple consisting of the minimum and maximum values of all samples in
+ the sound fragment.
+
+
.. function:: mul(fragment, width, factor)
Return a fragment that has all samples in the original fragment multiplied by