aboutsummaryrefslogtreecommitdiffstats
path: root/libavcodec/rangecoder.h
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2013-11-14 13:14:41 +0100
committerMichael Niedermayer <michaelni@gmx.at>2013-11-14 13:14:41 +0100
commitb71e4d8717450e6d6d08125fbd24a74f082dff71 (patch)
treeeff948420644b739d148170772592a9e6874c63f /libavcodec/rangecoder.h
parent31c09b7663acdcc64031d6f251a667ce812f590f (diff)
parent8941971a8f2e24b9a84fe29f128d13ceb89c0a65 (diff)
downloadffmpeg-b71e4d8717450e6d6d08125fbd24a74f082dff71.tar.gz
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>
Diffstat (limited to 'libavcodec/rangecoder.h')
0 files changed, 0 insertions, 0 deletions