[FFmpeg-cvslog] Merge branch 'scale-filter-factor' of https://github.com/lkiesow/FFmpeg

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Sat Jan 25 16:35:03 2014 +0100| [682ddb89cf15a7d5cc1a1a37156703c8abdcc872] | committer: Michael Niedermayer

Merge branch 'scale-filter-factor' of https://github.com/lkiesow/FFmpeg

* 'scale-filter-factor' of https://github.com/lkiesow/FFmpeg:
  Documentation for scale filter factor
  Documentation for scale filter factor
  Fixed factor for scale filter
  Factors for scale filter

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

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