Merge pull request #1267 from antonlacon/ffmpeg-2.6.x
authorTed Hess <thess@kitschensync.net>
Mon, 18 May 2015 02:10:30 +0000 (22:10 -0400)
committerTed Hess <thess@kitschensync.net>
Mon, 18 May 2015 02:10:30 +0000 (22:10 -0400)
commit94222c8d5fa8a7dd450bcc4a95009058489be97c
tree099327f40105a1f6374d1b054b4892fb34bece1b
parent21645ec347120495a75dc30568013de5c4ebe376
parentd1a5f0ab5d481ec350ad63e28fac33be39cd302a
Merge pull request #1267 from antonlacon/ffmpeg-2.6.x

ffmpeg: update to 2.6.3, remove stray spaces