Merge master.
authorCarl Hetherington <cth@carlh.net>
Wed, 15 Jan 2014 16:36:28 +0000 (16:36 +0000)
committerCarl Hetherington <cth@carlh.net>
Wed, 15 Jan 2014 16:36:28 +0000 (16:36 +0000)
commit4e5d5c7dcc6470b8dc918d03a00e30c07df60efe
treec167419e927f260348b468aae5036815a6a640a5
parente8204f55c981493b99814f71a50b3c3d62601032
parentf71a23109d774dc65e4262e5dba41360732cf342
Merge master.
src/lib/encoder.cc
src/lib/ffmpeg_decoder.cc
src/lib/ffmpeg_examiner.cc
src/lib/film.cc
src/lib/player.cc
src/lib/transcode_job.cc