diff options
| author | Carl Hetherington <cth@carlh.net> | 2018-09-08 01:26:21 +0100 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2018-09-09 00:35:39 +0100 |
| commit | 895f945a6bababdf1964b0522d591db96368db22 (patch) | |
| tree | 32cd22c46022f9af5a27ad04aee9bab149f9b35e /src/wx | |
| parent | 701ce0c17fd6619d3161eb8239699f41e8c420a8 (diff) | |
Split parts of FFmpegEncoder into FFmpegFileEncoder.
Diffstat (limited to 'src/wx')
| -rw-r--r-- | src/wx/export_dialog.cc | 8 | ||||
| -rw-r--r-- | src/wx/export_dialog.h | 2 |
2 files changed, 5 insertions, 5 deletions
diff --git a/src/wx/export_dialog.cc b/src/wx/export_dialog.cc index 481408578..f75150e45 100644 --- a/src/wx/export_dialog.cc +++ b/src/wx/export_dialog.cc @@ -43,9 +43,9 @@ wxString format_extensions[] = { "mp4" }; -FFmpegEncoder::Format formats[] = { - FFmpegEncoder::FORMAT_PRORES, - FFmpegEncoder::FORMAT_H264, +ExportFormat formats[] = { + EXPORT_FORMAT_PRORES, + EXPORT_FORMAT_H264, }; ExportDialog::ExportDialog (wxWindow* parent) @@ -110,7 +110,7 @@ ExportDialog::path () const return wx_to_std (fn.GetFullPath()); } -FFmpegEncoder::Format +ExportFormat ExportDialog::format () const { DCPOMATIC_ASSERT (_format->GetSelection() >= 0 && _format->GetSelection() < FORMATS); diff --git a/src/wx/export_dialog.h b/src/wx/export_dialog.h index c6ccc875e..d6e3bdbb6 100644 --- a/src/wx/export_dialog.h +++ b/src/wx/export_dialog.h @@ -31,7 +31,7 @@ public: explicit ExportDialog (wxWindow* parent); boost::filesystem::path path () const; - FFmpegEncoder::Format format () const; + ExportFormat format () const; bool mixdown_to_stereo () const; int x264_crf () const; |