Merge 1.0.
authorCarl Hetherington <cth@carlh.net>
Tue, 24 Dec 2013 00:18:03 +0000 (00:18 +0000)
committerCarl Hetherington <cth@carlh.net>
Tue, 24 Dec 2013 00:18:03 +0000 (00:18 +0000)
commite194f0003b60b2607da0822485c56cd8267e78dc
tree85aa72e1c8131372ec813c3d5a3a7f0cbb53568e
parent6d39d3df8e2fed1ec5e13d54ce6cd22c59b69eba
parent3318969a7ad685fc2f624ac0af302ca1e454e62b
Merge 1.0.
src/lib/encoder.cc
src/lib/types.h
src/lib/video_content.cc
src/lib/video_decoder.cc
src/tools/server_test.cc
src/wx/video_panel.cc