virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-12-23 12:43:46 +02:00
Code Issues Releases Activity

Merge commit '8114c101607843a86960bd3e0e9c40487dc2a961'

Browse Source 
* commit '8114c101607843a86960bd3e0e9c40487dc2a961':
  lavfi: add avfilter_get_class().

Conflicts:
	libavfilter/avfilter.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer 2013-04-11 10:59:06 +02:00
commit 44d4488301
2 changed files with 12 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
libavfilter/avfilter.c
View File

@ -490,11 +490,6 @@ static const AVClass avfilter_class = {
.child_class_next = filter_child_class_next, .child_class_next = filter_child_class_next,
}; };
const AVClass *avfilter_get_class(void)
{
return &avfilter_class;
}
int avfilter_open(AVFilterContext **filter_ctx, AVFilter *filter, const char *inst_name) int avfilter_open(AVFilterContext **filter_ctx, AVFilter *filter, const char *inst_name)
{ {
AVFilterContext *ret; AVFilterContext *ret;
@ -1038,3 +1033,8 @@ int ff_filter_frame(AVFilterLink *link, AVFrame *frame)
return ff_filter_frame_framed(link, frame); return ff_filter_frame_framed(link, frame);
} }
} }
const AVClass *avfilter_get_class(void)
{
return &avfilter_class;
}

13
libavfilter/avfilter.h
View File

@ -60,11 +60,6 @@ const char *avfilter_configuration(void);
*/ */
const char *avfilter_license(void); const char *avfilter_license(void);
/**
* Get the class for the AVFilterContext struct.
*/
const AVClass *avfilter_get_class(void);
typedef struct AVFilterContext AVFilterContext; typedef struct AVFilterContext AVFilterContext;
typedef struct AVFilterLink AVFilterLink; typedef struct AVFilterLink AVFilterLink;
typedef struct AVFilterPad AVFilterPad; typedef struct AVFilterPad AVFilterPad;
@ -910,8 +905,14 @@ attribute_deprecated
int avfilter_copy_buf_props(AVFrame *dst, const AVFilterBufferRef *src); int avfilter_copy_buf_props(AVFrame *dst, const AVFilterBufferRef *src);
#endif #endif
/**
* @return AVClass for AVFilterContext.
*
* @see av_opt_find().
*/
const AVClass *avfilter_get_class(void);
/** /**
* @} * @}
*/ */
#endif /* AVFILTER_AVFILTER_H */ #endif /* AVFILTER_AVFILTER_H */