Merge commit '86e5056575f55f070609dd3926605302f7d2280e'

* commit '86e5056575f55f070609dd3926605302f7d2280e':
  lavfi: Drop deprecated public AVFilterPad struct

Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
This commit is contained in:
Hendrik Leppkes
2015-09-05 16:01:24 +02:00
4 changed files with 0 additions and 167 deletions

View File

@@ -501,19 +501,10 @@ AVFilter *avfilter_get_by_name(const char *name)
int avfilter_register(AVFilter *filter)
{
AVFilter **f = last_filter;
int i;
/* the filter must select generic or internal exclusively */
av_assert0((filter->flags & AVFILTER_FLAG_SUPPORT_TIMELINE) != AVFILTER_FLAG_SUPPORT_TIMELINE);
for(i=0; filter->inputs && filter->inputs[i].name; i++) {
const AVFilterPad *input = &filter->inputs[i];
#if FF_API_AVFILTERPAD_PUBLIC
av_assert0( !input->filter_frame
|| (!input->start_frame && !input->end_frame));
#endif
}
filter->next = NULL;
while(*f || avpriv_atomic_ptr_cas((void * volatile *)f, NULL, filter))