diff options
| author | Carl Hetherington <cth@carlh.net> | 2017-05-10 10:29:18 +0100 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2017-05-10 10:29:18 +0100 |
| commit | 7f40b703e8a83f07a1c8bffb45cd40ebcc238418 (patch) | |
| tree | 59fb9d571b54be024f9ac9f3b1c7da429d1eb0f4 /src | |
| parent | 3e3371327c0f9c7ceebd1b44fd0c6ae85f0ae621 (diff) | |
Add H.264 export.
Diffstat (limited to 'src')
| -rw-r--r-- | src/lib/ffmpeg_transcoder.cc | 4 | ||||
| -rw-r--r-- | src/lib/ffmpeg_transcoder.h | 3 | ||||
| -rw-r--r-- | src/wx/export_dialog.cc | 5 |
3 files changed, 10 insertions, 2 deletions
diff --git a/src/lib/ffmpeg_transcoder.cc b/src/lib/ffmpeg_transcoder.cc index 510966f0c..5bd0a1747 100644 --- a/src/lib/ffmpeg_transcoder.cc +++ b/src/lib/ffmpeg_transcoder.cc @@ -53,6 +53,10 @@ FFmpegTranscoder::FFmpegTranscoder (shared_ptr<const Film> film, weak_ptr<Job> j _pixel_format = AV_PIX_FMT_YUV422P10; _codec_name = "prores_ks"; break; + case FORMAT_H264: + _pixel_format = AV_PIX_FMT_YUV420P; + _codec_name = "libx264"; + break; } } diff --git a/src/lib/ffmpeg_transcoder.h b/src/lib/ffmpeg_transcoder.h index 9799285e2..a42de86b0 100644 --- a/src/lib/ffmpeg_transcoder.h +++ b/src/lib/ffmpeg_transcoder.h @@ -33,7 +33,8 @@ class FFmpegTranscoder : public Transcoder public: enum Format { - FORMAT_PRORES + FORMAT_PRORES, + FORMAT_H264 }; FFmpegTranscoder (boost::shared_ptr<const Film> film, boost::weak_ptr<Job> job, boost::filesystem::path output, Format format); diff --git a/src/wx/export_dialog.cc b/src/wx/export_dialog.cc index fb50e1134..10c289d82 100644 --- a/src/wx/export_dialog.cc +++ b/src/wx/export_dialog.cc @@ -25,18 +25,21 @@ using boost::bind; -#define FORMATS 1 +#define FORMATS 2 wxString format_names[] = { _("ProRes"), + _("H.264") }; wxString format_filters[] = { _("MOV files (*.mov)|*.mov"), + _("MP4 files (*.mp4)|*.mp4"), }; FFmpegTranscoder::Format formats[] = { FFmpegTranscoder::FORMAT_PRORES, + FFmpegTranscoder::FORMAT_H264, }; ExportDialog::ExportDialog (wxWindow* parent) |