Merge branch '1.0' into 1.0-3D-take2
authorCarl Hetherington <cth@carlh.net>
Mon, 22 Jul 2013 15:27:33 +0000 (16:27 +0100)
committerCarl Hetherington <cth@carlh.net>
Mon, 22 Jul 2013 15:27:33 +0000 (16:27 +0100)
1  2 
src/lib/ffmpeg_decoder.cc

Simple merge