]> git.sesse.net Git - ffmpeg/commit
Merge commit '460e7b4f6d473d9f03ed45501221f9cb209b28fd'
authorMichael Niedermayer <michaelni@gmx.at>
Wed, 10 Apr 2013 15:13:29 +0000 (17:13 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Wed, 10 Apr 2013 15:36:29 +0000 (17:36 +0200)
commit1c3cdf533ba0f47e70b166b335fe3282264950d7
tree7ad99a625ca16927836d686159ac6ec7aedbf12e
parent200e04c70f9a77fd117d4ebb9d0fad9656514979
parent460e7b4f6d473d9f03ed45501221f9cb209b28fd
Merge commit '460e7b4f6d473d9f03ed45501221f9cb209b28fd'

* commit '460e7b4f6d473d9f03ed45501221f9cb209b28fd':
  vf_cropdetect: switch to an AVOptions-based system.

Conflicts:
doc/filters.texi
libavfilter/vf_cropdetect.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
libavfilter/avfilter.c
libavfilter/vf_cropdetect.c