aboutsummaryrefslogtreecommitdiffstats
path: root/libavutil/channel_layout.h
diff options
context:
space:
mode:
authorTimothy Gu <timothygu99@gmail.com>2014-07-04 11:06:44 -0700
committerMichael Niedermayer <michaelni@gmx.at>2014-07-04 22:06:49 +0200
commitbeed4ac1108a193f582598880d8cc6f59ba58a17 (patch)
tree735059d2f6216b3ae7e91d271fe5aa5db8745f30 /libavutil/channel_layout.h
parent31a6dfcbf74d26f2b9b3cd16ffbf9a086483e536 (diff)
downloadffmpeg-beed4ac1108a193f582598880d8cc6f59ba58a17.tar.gz
channel_layout: doxy: merge functions with macros
Signed-off-by: Timothy Gu <timothygu99@gmail.com> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavutil/channel_layout.h')
-rw-r--r--libavutil/channel_layout.h7
1 files changed, 2 insertions, 5 deletions
diff --git a/libavutil/channel_layout.h b/libavutil/channel_layout.h
index bc6befd8e3..dea4d6093d 100644
--- a/libavutil/channel_layout.h
+++ b/libavutil/channel_layout.h
@@ -79,7 +79,7 @@
/**
* @}
- * @defgroup channel_mask_c Audio channel convenience macros
+ * @defgroup channel_mask_c Audio channel layouts
* @{
* */
#define AV_CH_LAYOUT_MONO (AV_CH_FRONT_CENTER)
@@ -122,10 +122,6 @@ enum AVMatrixEncoding {
};
/**
- * @}
- */
-
-/**
* Return a channel layout id that matches name, or 0 if no match is found.
*
* name can be one or several of the following notations,
@@ -220,6 +216,7 @@ int av_get_standard_channel_layout(unsigned index, uint64_t *layout,
/**
* @}
+ * @}
*/
#endif /* AVUTIL_CHANNEL_LAYOUT_H */