]> git.sesse.net Git - ffmpeg/commitdiff
Merge remote-tracking branch 'ubitux/shorthand-cleanup'
authorMichael Niedermayer <michaelni@gmx.at>
Thu, 11 Apr 2013 09:54:05 +0000 (11:54 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Thu, 11 Apr 2013 09:54:10 +0000 (11:54 +0200)
* ubitux/shorthand-cleanup:
  lavfi/setfield: switch to an AVOptions-based system.
  lavfi/asettb: switch to an AVOptions-based system.
  lavfi/aselect: switch to an AVOptions-based system.
  lavfi/sine: switch to an AVOptions-based system.
  lavfi/deshake: switch to an AVOptions-based system.
  lavfi/tinterlace: switch to an AVOptions-based system.
  lavfi/tile: switch to an AVOptions-based system.
  lavfi/concat: switch to an AVOptions-based system.

Merged-by: Michael Niedermayer <michaelni@gmx.at>

Trivial merge