summaryrefslogtreecommitdiff
path: root/gtk2_ardour/export_video_dialog.cc
diff options
context:
space:
mode:
authorRobin Gareus <robin@gareus.org>2013-09-08 18:26:02 +0200
committerRobin Gareus <robin@gareus.org>2013-09-08 18:27:41 +0200
commit25cd52b392516b9e7bd13102843351dbdb1033dd (patch)
tree3e4207d0a5a490ef05a3fd1105c0c3a4bcd5270c /gtk2_ardour/export_video_dialog.cc
parent5ec69e23746ee347301e99edeecc7dbbfcb87f40 (diff)
vtl: update to ffmpeg v1.2.1 [lib]x264 option.
Diffstat (limited to 'gtk2_ardour/export_video_dialog.cc')
-rw-r--r--gtk2_ardour/export_video_dialog.cc10
1 files changed, 2 insertions, 8 deletions
diff --git a/gtk2_ardour/export_video_dialog.cc b/gtk2_ardour/export_video_dialog.cc
index cd45bb368e..c7ef6efd9a 100644
--- a/gtk2_ardour/export_video_dialog.cc
+++ b/gtk2_ardour/export_video_dialog.cc
@@ -257,8 +257,7 @@ ExportVideoDialog::ExportVideoDialog (PublicEditor& ed, Session* s)
video_codec_combo.append_text("mjpeg");
video_codec_combo.append_text("mpeg2video");
video_codec_combo.append_text("mpeg4");
- video_codec_combo.append_text("x264 (baseline)");
- video_codec_combo.append_text("x264 (hq)");
+ video_codec_combo.append_text("h264");
video_codec_combo.append_text("vpx (webm)");
video_codec_combo.append_text("copy");
video_codec_combo.set_active(4);
@@ -612,13 +611,8 @@ ExportVideoDialog::encode_pass (int pass)
ffs["-strict"] = "-2";
}
- if (video_codec_combo.get_active_text() == "x264 (hq)" ) {
+ if (video_codec_combo.get_active_text() == "h264" ) {
ffs["-vcodec"] = "libx264";
- ffs["-vprofile"] = "high";
- }
- else if (video_codec_combo.get_active_text() == "x264 (baseline)" ) {
- ffs["-vcodec"] = "libx264";
- ffs["-vpre"] = "baseline";
}
else if (video_codec_combo.get_active_text() == "vpx (webm)" ) {
ffs["-vcodec"] = "libvpx";