diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-04-10 19:21:59 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-04-10 19:21:59 +0200 |
| commit | 81c1ed748be53da95c2dbda4e16794afcf0851b3 (patch) | |
| tree | 243ace87a2748ac60899bc7491901e3a2e03fa3c /libswresample | |
| parent | b8a1f8b4e28b4ff85aae8fdedf586d60f0514118 (diff) | |
| parent | f13ab29925883b4245da4129694af3af378d67be (diff) | |
| download | ffmpeg-81c1ed748be53da95c2dbda4e16794afcf0851b3.tar.gz | |
Merge commit 'f13ab29925883b4245da4129694af3af378d67be'
* commit 'f13ab29925883b4245da4129694af3af378d67be':
vf_fps: switch to an AVOptions-based system.
Conflicts:
libavfilter/vf_fps.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libswresample')
0 files changed, 0 insertions, 0 deletions