diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-02-15 04:05:04 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-02-15 04:05:04 +0100 |
| commit | baaa6d6785bca89683240a362eb8aee1fb97abcb (patch) | |
| tree | a207ebd64e143b57c0387693c8269681e86e79dd | |
| parent | efe4a06929a885c740a255c42a746758cd60e97f (diff) | |
| parent | ba7dfe5c50b2b618b54ff1e7c3972b07d172f163 (diff) | |
| download | ffmpeg-baaa6d6785bca89683240a362eb8aee1fb97abcb.tar.gz | |
Merge remote-tracking branch 'qatar/master'
* qatar/master:
lavfi doxy: add buffer{src,sink}.h to the main lavfi doxy group
Conflicts:
libavfilter/buffersink.h
libavfilter/buffersrc.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>
| -rw-r--r-- | libavfilter/buffersink.h | 11 | ||||
| -rw-r--r-- | libavfilter/buffersrc.h | 11 |
2 files changed, 22 insertions, 0 deletions
diff --git a/libavfilter/buffersink.h b/libavfilter/buffersink.h index 7298116c96..24cd2feac7 100644 --- a/libavfilter/buffersink.h +++ b/libavfilter/buffersink.h @@ -21,11 +21,18 @@ /** * @file + * @ingroup lavfi_buffersink * memory buffer sink API for audio and video */ #include "avfilter.h" +/** + * @defgroup lavfi_buffersink Buffer sink API + * @ingroup lavfi + * @{ + */ + #if FF_API_AVFILTERBUFFER /** * Get an audio/video buffer data from buffer_sink and put it in bufref. @@ -190,4 +197,8 @@ int av_buffersink_get_frame(AVFilterContext *ctx, AVFrame *frame); */ int av_buffersink_get_samples(AVFilterContext *ctx, AVFrame *frame, int nb_samples); +/** + * @} + */ + #endif /* AVFILTER_BUFFERSINK_H */ diff --git a/libavfilter/buffersrc.h b/libavfilter/buffersrc.h index be5d3a6384..5d124337b5 100644 --- a/libavfilter/buffersrc.h +++ b/libavfilter/buffersrc.h @@ -22,12 +22,19 @@ /** * @file + * @ingroup lavfi_buffersrc * Memory buffer source API. */ #include "libavcodec/avcodec.h" #include "avfilter.h" +/** + * @defgroup lavfi_buffersrc Buffer source API + * @ingroup lavfi + * @{ + */ + enum { /** @@ -146,4 +153,8 @@ int av_buffersrc_add_frame_flags(AVFilterContext *buffer_src, AVFrame *frame, int flags); +/** + * @} + */ + #endif /* AVFILTER_BUFFERSRC_H */ |