Merge commit 'fba0156af77b11ec99edf4ee8f511b7aaa6b1891'
authorMichael Niedermayer <michaelni@gmx.at>
Wed, 10 Apr 2013 14:56:33 +0000 (16:56 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Wed, 10 Apr 2013 14:56:33 +0000 (16:56 +0200)
commit200e04c70f9a77fd117d4ebb9d0fad9656514979
tree6d13479cc172497e295341fe05ce869fb51a9c19
parenteb6d58d23c557fe53b6b26f9e0b2350c1046b56d
parentfba0156af77b11ec99edf4ee8f511b7aaa6b1891
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 <michaelni@gmx.at>
doc/filters.texi
libavfilter/avfilter.c
libavfilter/vf_crop.c