highperfocused/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki 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
parent 71052d85c1 0b9716c455
commit fba1592f35
2 changed files with 6 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
doc/examples/muxing.c
View File

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