[FFmpeg-cvslog] Merge remote-tracking branch 'ubitux/lavfi-mixed-short-long'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Thu Apr 11 11:09:44 2013 +0200| [d7e8b3d83179b811764660f5613905f7eb726291] | committer: Michael Niedermayer

Merge remote-tracking branch 'ubitux/lavfi-mixed-short-long'

* ubitux/lavfi-mixed-short-long:
  lavfi: restore mixed short/long option support with the new system.

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

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