ffmpeg: update

While I know this probably shouldn't go into stable branch, this update
is API/ABI-compatible and contains several very important security
fixes, including
http://blog.securitymouse.com/2014/06/raising-lazarus-20-year-old-bug-that.html

Signed-off-by: Timothy Gu <timothygu99@gmail.com>
openssl: update

Again, a security update, including the fix for Heartbleed.

Signed-off-by: Timothy Gu <timothygu99@gmail.com>
Merge branch 'stable'

Conflicts:
	src/ffmpeg.mk