Merge commit '946f95354ba76ef73c9b66889d86ab5fba4fb486'
authorMichael Niedermayer <michaelni@gmx.at>
Sat, 18 Oct 2014 11:51:59 +0000 (13:51 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Sat, 18 Oct 2014 11:52:06 +0000 (13:52 +0200)
commit17a065cf204fb626b6940b1bc3df5d6ab9f4a468
treebfb481ba8df17aaf8bba25bdfcda02e1d8ad21c0
parent74128352047ee3fb075b0f69ab16047f70b45a42
parent946f95354ba76ef73c9b66889d86ab5fba4fb486
Merge commit '946f95354ba76ef73c9b66889d86ab5fba4fb486'

* commit '946f95354ba76ef73c9b66889d86ab5fba4fb486':
  lavc: make rc_qmod_* into private options of mpegvideo encoders

Merged-by: Michael Niedermayer <michaelni@gmx.at>
libavcodec/avcodec.h
libavcodec/mpegvideo.h
libavcodec/mpegvideo_enc.c
libavcodec/options_table.h
libavcodec/ratecontrol.c