summaryrefslogtreecommitdiffstats
path: root/Doc
diff options
context:
space:
mode:
authorEzio Melotti <ezio.melotti@gmail.com>2012-12-14 18:19:49 (GMT)
committerEzio Melotti <ezio.melotti@gmail.com>2012-12-14 18:19:49 (GMT)
commit30505413df61f1cd7d550d6b90e08e691c62479a (patch)
tree1a5b6348472285649df6a45b5c583a8f1ef56f28 /Doc
parent11def426c0d7b6f81e324b295ba731386adb862a (diff)
parente0035a212ba6acbff6b1262dd6930a3a7ec1f204 (diff)
downloadcpython-30505413df61f1cd7d550d6b90e08e691c62479a.zip
cpython-30505413df61f1cd7d550d6b90e08e691c62479a.tar.gz
cpython-30505413df61f1cd7d550d6b90e08e691c62479a.tar.bz2
#16683: merge with 3.2.
Diffstat (limited to 'Doc')
-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