Merge pull request #1280 from antonlacon/ffmpeg-2.6.x
authorTed Hess <thess@kitschensync.net>
Sat, 23 May 2015 13:00:45 +0000 (09:00 -0400)
committerTed Hess <thess@kitschensync.net>
Sat, 23 May 2015 13:00:45 +0000 (09:00 -0400)
commitb91eff9859c28cf8c5e4b1013047b42463912e56
tree3f4343cde2d0a3fb7ec917cc31f3e80ee9af2228
parent0429e223d9ab824557a3b01eb9d8e4188dff4458
parentae13b1441da30199ed91fc78f47673373fae6c90
Merge pull request #1280 from antonlacon/ffmpeg-2.6.x

ffmpeg: switch to included opus support for libffmpeg-audio-dec and option to libffmpeg-custom