[FFmpeg-cvslog] Merge remote-tracking branch 'mbouron/shorthand-cleanup'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Thu Apr 11 01:03:02 2013 +0200| [72ce979f109f7fcfcb44a0fe12ea025b89b80dfc] | committer: Michael Niedermayer

Merge remote-tracking branch 'mbouron/shorthand-cleanup'

* mbouron/shorthand-cleanup:
  lavfi/kerndeint: switch to AVOption-based system
  lavfi/il: switch to AVOption-based system

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

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=72ce979f109f7fcfcb44a0fe12ea025b89b80dfc
---