Merge commit '47812070a267cbdf74164e154d03d99bf8ced100'
authorMichael Niedermayer <michaelni@gmx.at>
Tue, 15 Jan 2013 14:51:04 +0000 (15:51 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Tue, 15 Jan 2013 14:51:14 +0000 (15:51 +0100)
commite074fe2962df5a43ac41f26b2180094057600cc5
tree00fb58c9509ecf69dd7fa70c0aabca147dfb30bd
parent9aeffb3c2a0d86a1271836f87915d3a2e069cdd2
parent47812070a267cbdf74164e154d03d99bf8ced100
Merge commit '47812070a267cbdf74164e154d03d99bf8ced100'

* commit '47812070a267cbdf74164e154d03d99bf8ced100':
  libx264: use the library specific default rc_initial_buffer_occupancy

Merged-by: Michael Niedermayer <michaelni@gmx.at>
libavcodec/libx264.c