diff options
| author | Carl Hetherington <cth@carlh.net> | 2012-10-17 00:06:10 +0100 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2012-10-17 00:06:10 +0100 |
| commit | 7ef2ba523ca2ddc0470f5837bc88ad9c597361e2 (patch) | |
| tree | 9aaa33632f2c41e8c3129543c8214c8c3d7274cb /src/lib/server.cc | |
| parent | 9e93c860759b8d04277596781706488f59a3cc12 (diff) | |
| parent | c37c744bbb236b1fd39f86e4f0ab36652d403d67 (diff) | |
Merge branch 'master' of /home/carl/git/dvdomatic
Diffstat (limited to 'src/lib/server.cc')
| -rw-r--r-- | src/lib/server.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/lib/server.cc b/src/lib/server.cc index e8a9804ed..10f64b482 100644 --- a/src/lib/server.cc +++ b/src/lib/server.cc @@ -90,7 +90,7 @@ Server::process (shared_ptr<Socket> socket) Size out_size (get_required_int (kv, "output_width"), get_required_int (kv, "output_height")); int padding = get_required_int (kv, "padding"); int subtitle_offset = get_required_int (kv, "subtitle_offset"); - int subtitle_scale = get_required_int (kv, "subtitle_scale"); + float subtitle_scale = get_required_float (kv, "subtitle_scale"); string scaler_id = get_required_string (kv, "scaler"); int frame = get_required_int (kv, "frame"); int frames_per_second = get_required_int (kv, "frames_per_second"); |