diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-04-10 13:43:19 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-04-10 13:43:19 +0200 |
| commit | 451315830a3b8ff4014cd0dda8583f5845e5a8d0 (patch) | |
| tree | 89109e640f924cc01ea92b6879c752b3f9bb0257 /libavfilter/avcodec.h | |
| parent | 828044aca289f12356e1bdcda232430d8ed22e2d (diff) | |
| parent | d28cb849899abd98bf2dd72f5a3dd56d441aeb27 (diff) | |
| download | ffmpeg-451315830a3b8ff4014cd0dda8583f5845e5a8d0.tar.gz | |
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>
Diffstat (limited to 'libavfilter/avcodec.h')
0 files changed, 0 insertions, 0 deletions