mirror of
https://git.videolan.org/git/ffmpeg.git
synced 2024-09-28 16:02:17 +02:00
Merge commit 'd28cb849899abd98bf2dd72f5a3dd56d441aeb27'
* 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:
commit
451315830a