MIAMI -- Justin Miller, who spent the past two seasons working out of the Marlins bullpen, has reached agreement on a Minor League contract with the Giants.

According to an industry source, the 31-year-old right-hander will be a non-roster Spring Training invitee with the Giants.

After being used heavily in the first half, in both long relief and setup situations, Miller was placed on the disabled list with right elbow inflammation on July 5.

Miller was designated for assignment on Aug. 15.

In 46 games for Florida this past season, Miller was 4-2 with a 4.24 ERA. He threw 46 2/3 innings, striking out 43 and walking 20.

Miller joined the Marlins in 2007 and made 62 appearances, posting a 5-0 record with a 3.65 ERA.

Miller broke in with the Blue Jays in 2002. Early in his career, he was a starting pitcher.

The veteran has appeared in 153 games, including 33 starts.