Merge 1.0
authorCarl Hetherington <cth@carlh.net>
Tue, 31 Dec 2013 15:44:51 +0000 (15:44 +0000)
committerCarl Hetherington <cth@carlh.net>
Tue, 31 Dec 2013 15:44:51 +0000 (15:44 +0000)
commitad49361b303d1ceff7048fa0e89ba609ca9ce376
treebe6413325604b0d403add54a8de6ea861ec90772
parentb2a9271256e09fcfedff3beea5fc73c04e7c0e14
parent5625ba9542e38504e87799dd655be5071161fb1f
Merge 1.0
src/lib/encoder.cc
src/lib/player.cc