Commit 45131583 authored by Michael Niedermayer's avatar Michael Niedermayer

Merge commit 'd28cb849'

* commit 'd28cb849':
  buffersrc: switch to an AVOptions-based system.

Conflicts:
	doc/filters.texi
	libavfilter/buffersrc.c

Commit not merged, merge left to maintainer.
Merged-by: 's avatarMichael Niedermayer <michaelni@gmx.at>
parents 828044ac d28cb849
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment