Merge remote-tracking branch 'qatar/master'
* qatar/master: (40 commits) H.264: template left MB handling H.264: faster fill_decode_caches H.264: faster write_back_* H.264: faster fill_filter_caches H.264: make filter_mb_fast support the case of unavailable top mb Do not include log.h in avutil.h Do not include pixfmt.h in avutil.h Do not include rational.h in avutil.h Do not include mathematics.h in avutil.h Do not include intfloat_readwrite.h in avutil.h Remove return statements following infinite loops without break RTSP: Doxygen comment cleanup doxygen: Escape '\' in Doxygen documentation. md5: cosmetics md5: use AV_WL32 to write result md5: add fate test md5: include correct headers md5: fix test program doxygen: Drop array size declarations from Doxygen parameter names. doxygen: Fix parameter names to match the function prototypes. ... Conflicts: libavcodec/x86/dsputil_mmx.c libavformat/flvenc.c libavformat/oggenc.c libavformat/wtv.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
@ -83,8 +83,8 @@ static char *parse_link_name(const char **buf, void *log_ctx)
|
||||
* Create an instance of a filter, initialize and insert it in the
|
||||
* filtergraph in *ctx.
|
||||
*
|
||||
* @param filt_ctx put here a filter context in case of successful creation and configuration, NULL otherwise.
|
||||
* @param ctx the filtergraph context
|
||||
* @param put here a filter context in case of successful creation and configuration, NULL otherwise.
|
||||
* @param index an index which is supposed to be unique for each filter instance added to the filtergraph
|
||||
* @param filt_name the name of the filter to create
|
||||
* @param args the arguments provided to the filter during its initialization
|
||||
|
Reference in New Issue
Block a user