diff options
| author | Robin Gareus <robin@gareus.org> | 2013-07-14 16:34:49 +0200 |
|---|---|---|
| committer | Robin Gareus <robin@gareus.org> | 2013-07-16 18:01:56 +0200 |
| commit | 003492cbf9b6636f97eba44481e08cbea46c5fea (patch) | |
| tree | eb391d8d18b2cce7a8cf6df71f99078635fe1775 /gtk2_ardour/export_video_dialog.cc | |
| parent | 8f5cc1dbbae40378b9fa7c046d31a12b8497b570 (diff) | |
move ff* structs & typedef into dedicated namespace
(further avoid conflicts with plugins)
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 ce85fad81e..eb4213b237 100644 --- a/gtk2_ardour/export_video_dialog.cc +++ b/gtk2_ardour/export_video_dialog.cc @@ -584,7 +584,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()) { @@ -740,7 +740,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 ) { |