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)
commit2c4023c4f8e9ed5c09a30e28cc0bf8633b7635a3
tree40c57fc38025dac70c13dbfd90c0c7740c381f25
parent8349f0c97d98c0b7550ff4c76ad25f8f06270d6a
parentf110ac8accbb2a0d83e6ad57f45acac8ffbf5c74
Merge branch '1.0' into 1.0-3D-take2
src/lib/ffmpeg_decoder.cc