diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2011-12-13 00:29:25 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2011-12-13 00:39:48 +0100 |
| commit | 8bc7fe4daf5c26555d77e2261c96ee14a800fad4 (patch) | |
| tree | 71999a1eb8bacb609b5789b34de369ed4b049cd4 /libavdevice | |
| parent | c83ef636a665b2e17f1b6745a98ec7a5719264df (diff) | |
| parent | 58c42af722cebecd86e340dc3ed9ec44b1fe4a55 (diff) | |
| download | ffmpeg-8bc7fe4daf5c26555d77e2261c96ee14a800fad4.tar.gz | |
Merge remote-tracking branch 'qatar/master'
* qatar/master:
doxygen: misc consistency, spelling and wording fixes
vcr1: drop unnecessary emms_c() calls without MMX code
Replace all uses of av_close_input_file() with avformat_close_input().
lavf: add avformat_close_input().
lavf: deprecate av_close_input_stream().
lavf doxy: add some basic demuxing documentation.
lavf doxy: add some general lavf information.
lavf doxy: add misc utility functions to a group.
lavf doxy: add av_guess_codec/format to the encoding group.
lavf doxy: add core functions to a doxy group.
Add basic libavdevice documentation.
lavc: convert error_recognition to err_recognition.
avconv: update -map option help text
x86: Require 7 registers for the cabac asm
x86: bswap: remove test for bswap instruction
bswap: make generic implementation more compiler-friendly
h264: remove useless cast
proresdec: fix decode_slice() prototype
Conflicts:
configure
doc/APIchanges
ffprobe.c
libavcodec/avcodec.h
libavcodec/celp_math.h
libavcodec/h264.c
libavfilter/src_movie.c
libavformat/anm.c
libavformat/avformat.h
libavformat/version.h
libavutil/avstring.h
libavutil/bswap.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavdevice')
| -rw-r--r-- | libavdevice/avdevice.h | 22 |
1 files changed, 22 insertions, 0 deletions
diff --git a/libavdevice/avdevice.h b/libavdevice/avdevice.h index 68e3a46a8d..d43a2c55bc 100644 --- a/libavdevice/avdevice.h +++ b/libavdevice/avdevice.h @@ -19,6 +19,28 @@ #ifndef AVDEVICE_AVDEVICE_H #define AVDEVICE_AVDEVICE_H +/** + * @file + * @ingroup lavd + * Main libavdevice API header + */ + +/** + * @defgroup lavd Special devices muxing/demuxing library + * @{ + * Libavdevice is a complementary library to @ref libavf "libavformat". It + * provides various "special" platform-specific muxers and demuxers, e.g. for + * grabbing devices, audio capture and playback etc. As a consequence, the + * (de)muxers in libavdevice are of the AVFMT_NOFILE type (they use their own + * I/O functions). The filename passed to avformat_open_input() often does not + * refer to an actually existing file, but has some special device-specific + * meaning - e.g. for the x11grab device it is the display name. + * + * To use libavdevice, simply call avdevice_register_all() to register all + * compiled muxers and demuxers. They all use standard libavformat API. + * @} + */ + #include "libavutil/avutil.h" #include "libavformat/avformat.h" |