diff options
| author | Michael Niedermayer <[email protected]> | 2013-04-10 16:56:33 +0200 |
|---|---|---|
| committer | Michael Niedermayer <[email protected]> | 2013-04-10 16:56:33 +0200 |
| commit | 200e04c70f9a77fd117d4ebb9d0fad9656514979 (patch) | |
| tree | 6d13479cc172497e295341fe05ce869fb51a9c19 /ffmpeg.c | |
| parent | eb6d58d23c557fe53b6b26f9e0b2350c1046b56d (diff) | |
| parent | fba0156af77b11ec99edf4ee8f511b7aaa6b1891 (diff) | |
Merge commit 'fba0156af77b11ec99edf4ee8f511b7aaa6b1891'
* commit 'fba0156af77b11ec99edf4ee8f511b7aaa6b1891':
vf_crop: switch to an AVOptions-based system.
Conflicts:
doc/filters.texi
libavfilter/vf_crop.c
Merged-by: Michael Niedermayer <[email protected]>
Diffstat (limited to 'ffmpeg.c')
0 files changed, 0 insertions, 0 deletions