A South African anti-apartheid campaigner who was imprisoned with Nelson Mandela has opened the World Justice Festival.

Denis Goldberg, 80, was convicted of sabotage for his role in the campaign against the state's racial segregation with Mandela and others, and spent 22 years in prison.

He launched the seventh World Justice Festival in Edinburgh today with a speech about his experiences, following a welcome by Edinburgh Council leader Andrew Burns.

The two-week festival features speeches, concerts, workshops, walking tours and other events.

Festival chair Matthew Crighton said: "It is a landmark event to have such a prominent figure as Denis Goldberg coming to Edinburgh to launch the festival.

"Professor Goldberg, through his long imprisonment in South Africa, has first-hand knowledge of injustice and his work in the peace and restorative justice movement, as well as his experience of rebuilding South Africa into a more just society.

"Edinburgh has the only world justice festival on the planet and we're especially pleased that this year it has grown to cover two full weeks. It shows how vibrant is the city's commitment to a better world and it offers a brilliant shop window on all this activity.

"While millions are unemployed, inequality is growing and our environment is in severe danger it's important that we highlight the creative thinking and the solutions coming from across the world.

"We don't just want to offer assistance to people at the sharp end, we want to learn from them and be part of the solution. It seems that too often in the media that the problems of the world are well aired but the solutions aren't."

Professor Goldberg was in Glasgow earlier on in the week to mark the 20th anniversary of Mr Mandela's visit to the city.

Mr Mandela had been given the Freedom of the City in 1981 and the council renamed St George's Place to Nelson Mandela Place in 1986, much to the annoyance of the South African Consulate, which was based there at the time.

On Wednesday, Professor Goldberg also visited the Riverside Museum where he viewed the Glasgow-built South African Railways Locomotive.