* commit 'bff36075':
  lavc: set the default rc_initial_buffer_occupancy

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