[FFmpeg-cvslog] Merge commit '15ec053c4c0b198a2e93eb8e60c8f41e091e0c40'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Sat Oct 18 15:58:52 2014 +0200| [709ab39cb9a4887a08ed0d8fc25c2ddc79731f85] | committer: Michael Niedermayer

Merge commit '15ec053c4c0b198a2e93eb8e60c8f41e091e0c40'

* commit '15ec053c4c0b198a2e93eb8e60c8f41e091e0c40':
  lavc: make border_masking into private options of mpegvideo encoders

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

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