diff options
| author | John Emmas <johne53@tiscali.co.uk> | 2013-07-17 18:15:51 +0100 |
|---|---|---|
| committer | John Emmas <johne53@tiscali.co.uk> | 2013-07-17 18:15:51 +0100 |
| commit | 5f15bc9f9fe8decfab02db7821b7b15e1d7d95ac (patch) | |
| tree | 643463d8f156a7ee6b4daa1c776e5ae2a9da16e0 /gtk2_ardour/export_video_dialog.cc | |
| parent | eeabf89d19214bb075709009a76b3354c4332ccf (diff) | |
| parent | 82d351f6ca3214ef77df555aca853e18137b7ab4 (diff) | |
Merge branch 'windows' of git.ardour.org:ardour/ardour into windows
Diffstat (limited to 'gtk2_ardour/export_video_dialog.cc')
| -rw-r--r-- | gtk2_ardour/export_video_dialog.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/gtk2_ardour/export_video_dialog.cc b/gtk2_ardour/export_video_dialog.cc index d51fd60e2b..7538c504f4 100644 --- a/gtk2_ardour/export_video_dialog.cc +++ b/gtk2_ardour/export_video_dialog.cc @@ -586,7 +586,7 @@ ExportVideoDialog::encode_pass (int pass) } std::string preset = preset_combo.get_active_text(); - FFSettings ffs ; /* = transcoder->default_encoder_settings(); */ + TranscodeFfmpeg::FFSettings ffs ; /* = transcoder->default_encoder_settings(); */ ffs.clear(); if (fps_checkbox.get_active()) { @@ -742,7 +742,7 @@ ExportVideoDialog::encode_pass (int pass) transcoder->set_avoffset(av_offset / (double)_session->nominal_frame_rate()); } - FFSettings meta = transcoder->default_meta_data(); + TranscodeFfmpeg::FFSettings meta = transcoder->default_meta_data(); if (meta_checkbox.get_active()) { ARDOUR::SessionMetadata * session_data = ARDOUR::SessionMetadata::Metadata(); if (session_data->year() > 0 ) { |