* commit '897d5c3a':
  lavf: Print a warning if failed to avoid negative timestamps when requested

Conflicts:
	libavformat/mux.c

See: ec6a5fc6Merged-by: Michael Niedermayer <michaelni@gmx.at>