diff options
| author | Carl Hetherington <cth@carlh.net> | 2013-04-19 11:11:26 +0100 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2013-04-19 11:11:26 +0100 |
| commit | 09bcbfa0c118bd523586f985b602d16cf183ac36 (patch) | |
| tree | 07b5473e29764db2b7b38bf698283a492bfa7caa /src | |
| parent | 2669eabbf18a37e79f745865878aeb87bef369ee (diff) | |
| parent | 4a3d017ef63c1442e00954c0c222b66ab51a4ee9 (diff) | |
Merge branch 'staging' of /home/carl/git/dvdomatic into staging
Diffstat (limited to 'src')
| -rw-r--r-- | src/lib/combiner.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/lib/combiner.cc b/src/lib/combiner.cc index 006dd2697..0a9eaf6b6 100644 --- a/src/lib/combiner.cc +++ b/src/lib/combiner.cc @@ -33,7 +33,7 @@ Combiner::Combiner (shared_ptr<Log> log) * @param image Frame image. */ void -Combiner::process_video (shared_ptr<Image> image, bool, shared_ptr<Subtitle>, double t) +Combiner::process_video (shared_ptr<Image> image, bool, shared_ptr<Subtitle>, double) { _image = image; } |