virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-01-24 13:56:33 +02:00
Code Issues Releases Activity

Merge commit 'f758ea6e99af6ebd24bbe222898a921c222e5593'

Browse Source 
* commit 'f758ea6e99af6ebd24bbe222898a921c222e5593':
  buffersink: document special error codes returned from av_buffersink_get_frame

Merged-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer 2014-02-15 03:48:50 +01:00
commit efe4a06929
1 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
libavfilter/buffersink.h
View File

@ -162,8 +162,12 @@ AVRational av_buffersink_get_frame_rate(AVFilterContext *ctx);
* @param frame pointer to an allocated frame that will be filled with data. * @param frame pointer to an allocated frame that will be filled with data.
* The data must be freed using av_frame_unref() / av_frame_free() * The data must be freed using av_frame_unref() / av_frame_free()
* *
* @return >= 0 in case of success, a negative AVERROR code in case of * @return
* failure. * - >= 0 if a frame was successfully returned.
* - AVERROR(EAGAIN) if no frames are available at this point; more
* input frames must be added to the filtergraph to get more output.
* - AVERROR_EOF if there will be no more output frames on this sink.
* - A different negative AVERROR code in other failure cases.
*/ */
int av_buffersink_get_frame(AVFilterContext *ctx, AVFrame *frame); int av_buffersink_get_frame(AVFilterContext *ctx, AVFrame *frame);
@ -178,6 +182,9 @@ int av_buffersink_get_frame(AVFilterContext *ctx, AVFrame *frame);
* frame will contain exactly nb_samples audio samples, except at * frame will contain exactly nb_samples audio samples, except at
* the end of stream, when it can contain less than nb_samples. * the end of stream, when it can contain less than nb_samples.
* *
* @return The return codes have the same meaning as for
* av_buffersink_get_samples().
*
* @warning do not mix this function with av_buffersink_get_frame(). Use only one or * @warning do not mix this function with av_buffersink_get_frame(). Use only one or
* the other with a single sink, not both. * the other with a single sink, not both.
*/ */