diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-04-10 13:52:53 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-04-10 13:59:45 +0200 |
| commit | 2a2a643c90ff091f1fa4a0634bcc4e18639bcee0 (patch) | |
| tree | 2f093ba8b00873b35ed154df0da9251bb6dbacc6 /libavformat | |
| parent | 451315830a3b8ff4014cd0dda8583f5845e5a8d0 (diff) | |
| parent | e67a87eac814c7805d18c983c43033a8a1bd62af (diff) | |
| download | ffmpeg-2a2a643c90ff091f1fa4a0634bcc4e18639bcee0.tar.gz | |
Merge commit 'e67a87eac814c7805d18c983c43033a8a1bd62af'
* commit 'e67a87eac814c7805d18c983c43033a8a1bd62af':
vf_(no)format: switch to an AVOptions-based system.
af_aformat: switch to an AVOptions-based system.
Conflicts:
doc/filters.texi
libavfilter/af_aformat.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavformat')
0 files changed, 0 insertions, 0 deletions