* commit 'eabdc2a8':
  lavf: use initial_padding instead of deprecated delay

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