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)
* commit '47812070a267cbdf74164e154d03d99bf8ced100':
  libx264: use the library specific default rc_initial_buffer_occupancy

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

Simple merge