[FFmpeg-cvslog] Merge commit 'a75c2eb25a62105c09b48521aef429dc8a231637'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Sat Oct 18 14:06:15 2014 +0200| [ec8f56efad2c1a150e822f6b11c54915446a2d09] | committer: Michael Niedermayer

Merge commit 'a75c2eb25a62105c09b48521aef429dc8a231637'

* commit 'a75c2eb25a62105c09b48521aef429dc8a231637':
  lavc: make rc_eq into private options of mpegvideo encoders

Conflicts:
	libavcodec/options_table.h

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

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