* commit '23aae62c2cb4504a09ceb8cd0cabc1c8b260f521': alsdec: Check k used for rice decoder. avfiltergraph: silence an uninitialized variable warning xsubenc: reindent lavc: replace AVCodecContext.encode with subtitle-specific callback lavc: add const to private codec class initialization. avconv: don't pass a bogus parameter to avfilter_graph_create_filter(). id3v2: strdup the genre name explicitly. lavf/id3v2: do not export empty fields. buffersrc: add const to the AVFrame* argument of av_buffersrc_write_frame() lavfi: replace empty input/output lists with null pointers Conflicts: ffmpeg_filter.c libavcodec/alsdec.c libavcodec/dvdsubenc.c libavcodec/utils.c libavcodec/v210dec.h libavfilter/af_channelsplit.c libavfilter/avfiltergraph.c libavfilter/buffersrc.c libavfilter/src_movie.c libavfilter/vf_ass.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
		
			
				
	
	
		
			96 lines
		
	
	
		
			2.8 KiB
		
	
	
	
		
			C
		
	
	
	
	
	
			
		
		
	
	
			96 lines
		
	
	
		
			2.8 KiB
		
	
	
	
		
			C
		
	
	
	
	
	
/*
 | 
						|
 *
 | 
						|
 * This file is part of Libav.
 | 
						|
 *
 | 
						|
 * Libav is free software; you can redistribute it and/or
 | 
						|
 * modify it under the terms of the GNU Lesser General Public
 | 
						|
 * License as published by the Free Software Foundation; either
 | 
						|
 * version 2.1 of the License, or (at your option) any later version.
 | 
						|
 *
 | 
						|
 * Libav is distributed in the hope that it will be useful,
 | 
						|
 * but WITHOUT ANY WARRANTY; without even the implied warranty of
 | 
						|
 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
 | 
						|
 * Lesser General Public License for more details.
 | 
						|
 *
 | 
						|
 * You should have received a copy of the GNU Lesser General Public
 | 
						|
 * License along with Libav; if not, write to the Free Software
 | 
						|
 * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
 | 
						|
 */
 | 
						|
 | 
						|
#ifndef AVFILTER_BUFFERSRC_H
 | 
						|
#define AVFILTER_BUFFERSRC_H
 | 
						|
 | 
						|
/**
 | 
						|
 * @file
 | 
						|
 * Memory buffer source API.
 | 
						|
 */
 | 
						|
 | 
						|
#include "libavcodec/avcodec.h"
 | 
						|
#include "avfilter.h"
 | 
						|
 | 
						|
enum {
 | 
						|
 | 
						|
    /**
 | 
						|
     * Do not check for format changes.
 | 
						|
     */
 | 
						|
    AV_BUFFERSRC_FLAG_NO_CHECK_FORMAT = 1,
 | 
						|
 | 
						|
    /**
 | 
						|
     * Do not copy buffer data.
 | 
						|
     */
 | 
						|
    AV_BUFFERSRC_FLAG_NO_COPY = 2,
 | 
						|
 | 
						|
    /**
 | 
						|
     * Immediately push the frame to the output.
 | 
						|
     */
 | 
						|
    AV_BUFFERSRC_FLAG_PUSH = 4,
 | 
						|
 | 
						|
};
 | 
						|
 | 
						|
/**
 | 
						|
 * Add buffer data in picref to buffer_src.
 | 
						|
 *
 | 
						|
 * @param buffer_src  pointer to a buffer source context
 | 
						|
 * @param picref      a buffer reference, or NULL to mark EOF
 | 
						|
 * @param flags       a combination of AV_BUFFERSRC_FLAG_*
 | 
						|
 * @return            >= 0 in case of success, a negative AVERROR code
 | 
						|
 *                    in case of failure
 | 
						|
 */
 | 
						|
int av_buffersrc_add_ref(AVFilterContext *buffer_src,
 | 
						|
                         AVFilterBufferRef *picref, int flags);
 | 
						|
 | 
						|
/**
 | 
						|
 * Get the number of failed requests.
 | 
						|
 *
 | 
						|
 * A failed request is when the request_frame method is called while no
 | 
						|
 * frame is present in the buffer.
 | 
						|
 * The number is reset when a frame is added.
 | 
						|
 */
 | 
						|
unsigned av_buffersrc_get_nb_failed_requests(AVFilterContext *buffer_src);
 | 
						|
 | 
						|
#ifdef FF_API_BUFFERSRC_BUFFER
 | 
						|
/**
 | 
						|
 * Add a buffer to the filtergraph s.
 | 
						|
 *
 | 
						|
 * @param buf buffer containing frame data to be passed down the filtergraph.
 | 
						|
 * This function will take ownership of buf, the user must not free it.
 | 
						|
 * A NULL buf signals EOF -- i.e. no more frames will be sent to this filter.
 | 
						|
 * @deprecated Use av_buffersrc_add_ref(s, picref, AV_BUFFERSRC_FLAG_NO_COPY) instead.
 | 
						|
 */
 | 
						|
attribute_deprecated
 | 
						|
int av_buffersrc_buffer(AVFilterContext *s, AVFilterBufferRef *buf);
 | 
						|
#endif
 | 
						|
 | 
						|
/**
 | 
						|
 * Add a frame to the buffer source.
 | 
						|
 *
 | 
						|
 * @param s an instance of the buffersrc filter.
 | 
						|
 * @param frame frame to be added.
 | 
						|
 *
 | 
						|
 * @warning frame data will be memcpy()ed, which may be a big performance
 | 
						|
 *          hit. Use av_buffersrc_buffer() to avoid copying the data.
 | 
						|
 */
 | 
						|
int av_buffersrc_write_frame(AVFilterContext *s, const AVFrame *frame);
 | 
						|
 | 
						|
#endif /* AVFILTER_BUFFERSRC_H */
 |