[FFmpeg-cvslog] channel_layout: doxy: merge functions with macros

[Timothy Gu]

ffmpeg | branch: master | Timothy Gu <timothygu99 at gmail.com> | Fri Jul  4 11:06:44 2014 -0700| [beed4ac1108a193f582598880d8cc6f59ba58a17] | committer: Michael Niedermayer

channel_layout: doxy: merge functions with macros

Signed-off-by: Timothy Gu <timothygu99 at gmail.com>
Signed-off-by: Michael Niedermayer <michaelni at gmx.at>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=beed4ac1108a193f582598880d8cc6f59ba58a17
---

 libavutil/channel_layout.h |    7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

diff --git a/libavutil/channel_layout.h b/libavutil/channel_layout.h
index bc6befd..dea4d60 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 */