diff options
| author | Carl Hetherington <cth@carlh.net> | 2012-07-24 19:12:41 +0100 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2012-07-24 19:12:41 +0100 |
| commit | 28bd5ee714ce2cb3660f46cc3da5a2af4a9e73e9 (patch) | |
| tree | 4752bddf1a62a8c4cee3c61fd4bd83e80244b1f5 | |
| parent | b0a1528d5416e31dcb8ed174aaf372a9e37e3294 (diff) | |
| parent | bfde7a8618e9cd3180c38142ff26e251e37d8502 (diff) | |
Merge.
| -rw-r--r-- | src/lib/film_state.cc | 2 | ||||
| -rw-r--r-- | windows/installer.nsi.in | 1 |
2 files changed, 2 insertions, 1 deletions
diff --git a/src/lib/film_state.cc b/src/lib/film_state.cc index ae70b53bd..343e9ebb4 100644 --- a/src/lib/film_state.cc +++ b/src/lib/film_state.cc @@ -168,7 +168,7 @@ FilmState::read_metadata (string k, string v) /* Itsy bitsy hack: compute digest here if don't have one (for backwards compatibility) */ if (content_digest.empty() && !content.empty()) { - content_digest = md5_digest (file (content)); + content_digest = md5_digest (content_path ()); } } diff --git a/windows/installer.nsi.in b/windows/installer.nsi.in index fe70153a1..8bea81af0 100644 --- a/windows/installer.nsi.in +++ b/windows/installer.nsi.in @@ -68,6 +68,7 @@ File "%deps%/bin/postproc-52.dll" File "%deps%/bin/swresample-0.dll" File "%deps%/bin/swscale-2.dll" File "%deps%/bin/zlib1.dll" +File "%deps%/libjpeg-8.dll" File "%binaries%/src/gtk/dvdomatic-gtk.dll" File "%binaries%/src/lib/dvdomatic.dll" |