Merge master.
authorCarl Hetherington <cth@carlh.net>
Mon, 8 Sep 2014 00:09:22 +0000 (01:09 +0100)
committerCarl Hetherington <cth@carlh.net>
Mon, 8 Sep 2014 00:09:22 +0000 (01:09 +0100)
commit946dbad9821e676f1d8fdc5abba459da54b8e84c
tree41c304d90a6609dbd5f1d4e2dc9b2331d137b541
parent5dc2dbdb6639f8d617a40209ad603d2a38f9df2a
parent34be35fc1ba9a0c0eaebd3e2a6be3eab134e80af
Merge master.
ChangeLog
src/lib/video_content.cc
src/lib/video_content.h
src/lib/video_content_scale.cc
src/lib/video_content_scale.h
src/lib/wscript