Merge commit 'd28cb849899abd98bf2dd72f5a3dd56d441aeb27'

Browse Source

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

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

Commit not merged, merge left to maintainer.

Merged-by: Michael Niedermayer <michaelni@gmx.at>

...

This commit is contained in:

Michael Niedermayer 2013-04-10 13:43:19 +02:00

parent 828044aca2 d28cb84989

commit 451315830a

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Show Stats Download Patch File Download Diff File Expand all files Collapse all files

Diff Content Not Available