Imported Upstream version 2.5
Merge tag 'upstream/2.5'

Upstream version 2.5
update debian/copyright
add new symbols
disable rtmp on powerpcspe and sparc64 as librtmp-dev is uninstallable
enable x265 on mips, mipsel and powerpc
disable opencv on powerpcspe
prepare new upload
Merge branch 'master' into wheezy

Conflicts:
	debian/changelog
	debian/control
	debian/rules