Merge remote-tracking branch 'qatar/master'

* qatar/master:
  doc/examples: misc Doxygen markup improvements

Conflicts:
	doc/examples/muxing.c
	doc/examples/transcode_aac.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>

doc/examples/muxing.c

@@ -24,8 +24,8 @@
  * @file
  * libavformat API example.
  *
- * Output a media file in any supported libavformat format.
- * The default codecs are used.
+ * Output a media file in any supported libavformat format. The default
+ * codecs are used.
  * @example doc/examples/muxing.c
  */
 

doc/examples/transcode_aac.c

@@ -17,7 +17,10 @@
  */
 
 /**
- * @file simple audio converter
+ * @file
+ * simple audio converter
+ *
+ * @example doc/examples/transcode_aac.c
  * Convert an input audio file to AAC in an MP4 container using FFmpeg.
  * @author Andreas Unterweger (dustsigns@gmail.com)
  */