diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-04-11 00:10:59 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-04-11 00:10:59 +0200 |
| commit | 6a2fb5b90cb77bbcd33102b6cfa76a786152c1c3 (patch) | |
| tree | 01b5badc0c32d180a63b8b81553cef40407f6884 /libavcodec/x86/dsputilenc.asm | |
| parent | 8695d9de4704aa328b6dd0e9826c04da44d04046 (diff) | |
| parent | ffea3b00c39caa8ad78456ae08c8353929974dfd (diff) | |
| download | ffmpeg-6a2fb5b90cb77bbcd33102b6cfa76a786152c1c3.tar.gz | |
Merge commit 'ffea3b00c39caa8ad78456ae08c8353929974dfd'
* commit 'ffea3b00c39caa8ad78456ae08c8353929974dfd':
vf_settb: switch to an AVOptions-based system.
Conflicts:
doc/filters.texi
libavfilter/f_settb.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/x86/dsputilenc.asm')
0 files changed, 0 insertions, 0 deletions