Merge commit '8941971a8f2e24b9a84fe29f128d13ceb89c0a65'
authorMichael Niedermayer <michaelni@gmx.at>
Thu, 14 Nov 2013 12:14:41 +0000 (13:14 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Thu, 14 Nov 2013 12:14:41 +0000 (13:14 +0100)
commitb71e4d8717450e6d6d08125fbd24a74f082dff71
treeeff948420644b739d148170772592a9e6874c63f
parent31c09b7663acdcc64031d6f251a667ce812f590f
parent8941971a8f2e24b9a84fe29f128d13ceb89c0a65
Merge commit '8941971a8f2e24b9a84fe29f128d13ceb89c0a65'

* commit '8941971a8f2e24b9a84fe29f128d13ceb89c0a65':
  lavc: make error_rate a private option of mpegvideo encoders

Conflicts:
libavcodec/options_table.h
libavcodec/version.h

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