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>
This commit is contained in:
Michael Niedermayer
2014-02-14 15:31:14 +01:00
2 changed files with 6 additions and 3 deletions

View File

@ -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)
*/