diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-04-10 13:27:33 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-04-10 13:30:17 +0200 |
| commit | 828044aca289f12356e1bdcda232430d8ed22e2d (patch) | |
| tree | 89109e640f924cc01ea92b6879c752b3f9bb0257 /libavfilter/vf_showinfo.c | |
| parent | d2752ef0615d0ce9cdf6effed97cd4750ffde4a9 (diff) | |
| parent | 4fa1f52e33b70029e2b621852f3af7c1ef9aecff (diff) | |
| download | ffmpeg-828044aca289f12356e1bdcda232430d8ed22e2d.tar.gz | |
Merge commit '4fa1f52e33b70029e2b621852f3af7c1ef9aecff'
* commit '4fa1f52e33b70029e2b621852f3af7c1ef9aecff':
af_resample: switch to an AVOptions-based system.
Conflicts:
libavfilter/avfilter.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavfilter/vf_showinfo.c')
0 files changed, 0 insertions, 0 deletions