Spain's secretary of state for sport Miguel Cardenal oversaw the negotiations, which settled the numbers of games each company could show on their individual platforms each week.
Mediapro will continue to show one match on their free-to-air channel each week and will control the international rights for La Liga.
"The agreement... establishes a viable model for the Spanish league and presents a stable scenario for football fans for the seasons 2012/13, 2013/14 and 2014/15," Mediapro said in a statement.
"The professional football league (LFP), for their part, guarantee the new agreement signed by both operators."
A group of 13 first division sides had forced a meeting with the LFP on Tuesday to call for a settlement of the dispute saying that it created "a situation of serious legal insecurity", and had threatened to postpone the season's start.
The new La Liga campaign kicks off this weekend with champions Real Madrid at home to Valencia and Barcelona hosting Real Sociedad, both on Sunday.
‘I don’t think Liverpool would look at Ollie Watkins, a striker isn’t a pressing issue for them – it’s Arsenal who need one’ Former Reds star explains why his old club don’t need an out-and-out forward this summer
‘He’ll still be playing at 40 at a good level because he’s in such good shape and looks after himself so well. He does everything to be a top professional’: Ex-Liverpool coach insists Mohamed Salah has plenty more miles in the tank
