Add H.264 export.

diff --git a/src/lib/ffmpeg_transcoder.cc b/src/lib/ffmpeg_transcoder.cc
index 510966f0c16422a81cd6ed705c73d620e54c92d3..5bd0a1747045f5b5aac7a67cb9e3324b23ad9c8d 100644 (file)
--- 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 9799285e2521f584ac17568389ca6d90216266d8..a42de86b0fef0eea763f032b95f8c1a68321154a 100644 (file)
--- 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 fb50e11347a2179c2d012de7f201b5a8758323c3..10c289d82c64302420e8000d99cf0cb529d7f14d 100644 (file)
--- 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)