summaryrefslogtreecommitdiff
path: root/src/wx
diff options
context:
space:
mode:
authorCarl Hetherington <cth@carlh.net>2017-05-10 11:54:19 +0100
committerCarl Hetherington <cth@carlh.net>2017-05-10 11:54:19 +0100
commitd8ea1796f34ff894b148a0af78c0a547e0496ee1 (patch)
tree2a3177217dee39c1a4dbe795c21369236e7a5533 /src/wx
parent7f40b703e8a83f07a1c8bffb45cd40ebcc238418 (diff)
Rename some classes.
Diffstat (limited to 'src/wx')
-rw-r--r--src/wx/export_dialog.cc8
-rw-r--r--src/wx/export_dialog.h4
2 files changed, 6 insertions, 6 deletions
diff --git a/src/wx/export_dialog.cc b/src/wx/export_dialog.cc
index 10c289d82..52aa03c20 100644
--- a/src/wx/export_dialog.cc
+++ b/src/wx/export_dialog.cc
@@ -37,9 +37,9 @@ wxString format_filters[] = {
_("MP4 files (*.mp4)|*.mp4"),
};
-FFmpegTranscoder::Format formats[] = {
- FFmpegTranscoder::FORMAT_PRORES,
- FFmpegTranscoder::FORMAT_H264,
+FFmpegEncoder::Format formats[] = {
+ FFmpegEncoder::FORMAT_PRORES,
+ FFmpegEncoder::FORMAT_H264,
};
ExportDialog::ExportDialog (wxWindow* parent)
@@ -76,7 +76,7 @@ ExportDialog::path () const
return wx_to_std (_file->GetPath ());
}
-FFmpegTranscoder::Format
+FFmpegEncoder::Format
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 04a516bca..239e56829 100644
--- a/src/wx/export_dialog.h
+++ b/src/wx/export_dialog.h
@@ -19,7 +19,7 @@
*/
#include "table_dialog.h"
-#include "lib/ffmpeg_transcoder.h"
+#include "lib/ffmpeg_encoder.h"
#include <wx/wx.h>
#include <boost/filesystem.hpp>
@@ -31,7 +31,7 @@ public:
ExportDialog (wxWindow* parent);
boost::filesystem::path path () const;
- FFmpegTranscoder::Format format () const;
+ FFmpegEncoder::Format format () const;
private:
void format_changed ();