Merge pull request #2847 from elupus/vda_ffmpeg
authorJoakim Plate <elupus@ecce.se>
Sat, 8 Jun 2013 13:52:40 +0000 (06:52 -0700)
committerJoakim Plate <elupus@ecce.se>
Sat, 8 Jun 2013 13:52:40 +0000 (06:52 -0700)
Vda ffmpeg

1  2 
configure.in

diff --cc configure.in
Simple merge