[FFmpeg-cvslog] Merge commit '946f95354ba76ef73c9b66889d86ab5fba4fb486'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Sat Oct 18 13:51:59 2014 +0200| [17a065cf204fb626b6940b1bc3df5d6ab9f4a468] | committer: Michael Niedermayer

Merge commit '946f95354ba76ef73c9b66889d86ab5fba4fb486'

* commit '946f95354ba76ef73c9b66889d86ab5fba4fb486':
  lavc: make rc_qmod_* 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=17a065cf204fb626b6940b1bc3df5d6ab9f4a468
---