* commit '884f7c97':
  output example: set the stream timebase

Conflicts:
	doc/examples/muxing.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>