diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2011-07-01 05:33:39 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2011-07-01 05:35:26 +0200 |
| commit | 721be993713550e7f1c3bccf670fd0a1be7e7738 (patch) | |
| tree | 500c5f113ad0092f52bca3bbb9db807d82c4ac92 /doc/examples | |
| parent | 9251942ca728e7807a2a95306415b27b36a8b8e7 (diff) | |
| parent | be73d76b34481686020e423ccabcca77042d0ede (diff) | |
| download | ffmpeg-721be993713550e7f1c3bccf670fd0a1be7e7738.tar.gz | |
Merge remote-tracking branch 'qatar/master'
* qatar/master:
cosmetics: fix some then/than typos
doxygen: Include libavcodec and libavformat examples into the documentation
avutil: elaborate documentation for av_get_random_seed
Add support for aac streams in mp4/mov without extradata.
aes: whitespace cosmetics
adler32: whitespace cosmetics
swscale: fix another yuv range conversion overflow in 16bit scaling.
Fix cpu flags test program
opt-test: Add missing braces to silence compiler warnings.
build: Eliminate obsolete test targets.
udp: Fix a compilation warning
swscale: Unbreak build with --enable-small
base64: add fate test
aes: improve test program and add fate test
adler32: make test program more useful and add fate test
swscale: fix yuv range correction when using 16-bit scaling.
aacenc: Make chan_map const correct
Conflicts:
Makefile
doc/examples/muxing-example.c
libavformat/udp.c
libavutil/random_seed.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'doc/examples')
| -rw-r--r-- | doc/examples/encoding-example.c | 3 | ||||
| -rw-r--r-- | doc/examples/muxing-example.c | 7 |
2 files changed, 7 insertions, 3 deletions
diff --git a/doc/examples/encoding-example.c b/doc/examples/encoding-example.c index a32c09ab69..afe7e4f277 100644 --- a/doc/examples/encoding-example.c +++ b/doc/examples/encoding-example.c @@ -20,8 +20,9 @@ /** * @file - * avcodec API use example. + * libavcodec API use example. * + * @example libavcodec/api-example.c * Note that this library only handles codecs (mpeg, mpeg4, etc...), * not file formats (avi, vob, etc...). See library 'libavformat' for the * format handling diff --git a/doc/examples/muxing-example.c b/doc/examples/muxing-example.c index f068e946dd..25ec9ce222 100644 --- a/doc/examples/muxing-example.c +++ b/doc/examples/muxing-example.c @@ -22,8 +22,11 @@ /** * @file - * Libavformat API example: Output a media file in any supported - * libavformat format. The default codecs are used. + * libavformat API example. + * + * @example libavformat/output-example.c + * Output a media file in any supported libavformat format. + * The default codecs are used. */ #include <stdlib.h> |