Traneptora/FFmpeg
1
Fork 0
forked from FFmpeg/FFmpeg
Code Pull requests Activity

Merge remote-tracking branch 'qatar/master'

Browse source 
* 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
commit fba1592f35
2 changed files with 6 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
doc/examples/muxing.c
View file

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

5
doc/examples/transcode_aac.c
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. * Convert an input audio file to AAC in an MP4 container using FFmpeg.
* @author Andreas Unterweger (dustsigns@gmail.com) * @author Andreas Unterweger (dustsigns@gmail.com)
*/ */