Merge branch 'master' into subs
authorCarl Hetherington <cth@carlh.net>
Wed, 10 Oct 2012 12:04:59 +0000 (13:04 +0100)
committerCarl Hetherington <cth@carlh.net>
Wed, 10 Oct 2012 12:04:59 +0000 (13:04 +0100)
commitd382f34db155ddaf4bb61538c18b87c7564e00b2
tree8c63943ad046240f9a307c640d022af750b07bb7
parentb5828ccf20a0e0c4365854ac19a05d5a4783e254
parent1bbd5367ddddfac18ceaa4d010cfc39f1daaa3a3
Merge branch 'master' into subs
src/lib/ffmpeg_decoder.cc
src/lib/film.cc
src/lib/film_state.cc