diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-02-14 15:31:14 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-02-14 15:31:14 +0100 |
| commit | fba1592f35501bff0f28d7885f4128dfc7b82777 (patch) | |
| tree | d24120d4e629ca0f261b21db7774acb8f5dc80d5 /doc | |
| parent | 71052d85c16bd65fa1e3e01d9040f9a3925efd7a (diff) | |
| parent | 0b9716c45568890dd1ff1b7cc5946c59eb3452e5 (diff) | |
| download | ffmpeg-streaming-fba1592f35501bff0f28d7885f4128dfc7b82777.zip ffmpeg-streaming-fba1592f35501bff0f28d7885f4128dfc7b82777.tar.gz | |
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>
Diffstat (limited to 'doc')
| -rw-r--r-- | doc/examples/muxing.c | 4 | ||||
| -rw-r--r-- | doc/examples/transcode_aac.c | 5 |
2 files changed, 6 insertions, 3 deletions
diff --git a/doc/examples/muxing.c b/doc/examples/muxing.c index a849e0a..9483607 100644 --- a/doc/examples/muxing.c +++ b/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 */ diff --git a/doc/examples/transcode_aac.c b/doc/examples/transcode_aac.c index 35deb4c..2d4e55a 100644 --- a/doc/examples/transcode_aac.c +++ b/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) */ |
