Merge commit 'a75c2eb25a62105c09b48521aef429dc8a231637'
authorMichael Niedermayer <michaelni@gmx.at>
Sat, 18 Oct 2014 12:06:15 +0000 (14:06 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Sat, 18 Oct 2014 12:06:15 +0000 (14:06 +0200)
commitec8f56efad2c1a150e822f6b11c54915446a2d09
treecdca1d57f0be58bd8dcb922344d9fc7559151c62
parent17a065cf204fb626b6940b1bc3df5d6ab9f4a468
parenta75c2eb25a62105c09b48521aef429dc8a231637
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@gmx.at>
libavcodec/avcodec.h
libavcodec/mpegvideo.h
libavcodec/mpegvideo_enc.c
libavcodec/options.c
libavcodec/options_table.h
libavcodec/ratecontrol.c