diff options
| author | Carl Hetherington <cth@carlh.net> | 2014-03-04 20:27:27 +0000 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2014-03-04 20:27:27 +0000 |
| commit | a79d78d8bb6d51f6662f1f63b9f8fd19e1a0c5f1 (patch) | |
| tree | 4b696815a80903ade7df8eccec23160b97e5ee05 /src/lib/ffmpeg_content.cc | |
| parent | 1b1bc528ee5ca1fee1bd33f9fb6f79cd551e3b33 (diff) | |
| parent | 5f66a692647fc901f7dca709ad08c65010bd84e7 (diff) | |
Merge master.
Diffstat (limited to 'src/lib/ffmpeg_content.cc')
| -rw-r--r-- | src/lib/ffmpeg_content.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/lib/ffmpeg_content.cc b/src/lib/ffmpeg_content.cc index 4a6cf9e04..bd5648ecb 100644 --- a/src/lib/ffmpeg_content.cc +++ b/src/lib/ffmpeg_content.cc @@ -1,5 +1,5 @@ /* - Copyright (C) 2013 Carl Hetherington <cth@carlh.net> + Copyright (C) 2013-2014 Carl Hetherington <cth@carlh.net> This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -60,7 +60,7 @@ FFmpegContent::FFmpegContent (shared_ptr<const Film> f, boost::filesystem::path FFmpegContent::FFmpegContent (shared_ptr<const Film> f, shared_ptr<const cxml::Node> node, int version) : Content (f, node) - , VideoContent (f, node) + , VideoContent (f, node, version) , AudioContent (f, node) , SubtitleContent (f, node, version) { |