* commit '1384df64':
  lavf: Add an option for avoiding negative timestamps

Conflicts:
	libavformat/avformat.h
	libavformat/mux.c
	libavformat/options_table.h
	libavformat/version.h

See: 3ba0dab7
See: a89c0125Merged-by: Michael Niedermayer <michaelni@gmx.at>