diff options
| author | Paul Davis <paul@linuxaudiosystems.com> | 2013-07-17 08:05:59 -0400 |
|---|---|---|
| committer | Paul Davis <paul@linuxaudiosystems.com> | 2013-07-17 08:05:59 -0400 |
| commit | 650964f3203319b013c49a286b5fc5fc203f3bbb (patch) | |
| tree | 60b2f879d4ed634f9420a737886086db5eb31f78 /gtk2_ardour/transcode_video_dialog.cc | |
| parent | 9cbe231b920d92a2e44e08962a3ed6870b962f34 (diff) | |
| parent | 780397d0ccf8df54eeb78c88eebbaab0c2745029 (diff) | |
Merge branch 'master' into windows
Diffstat (limited to 'gtk2_ardour/transcode_video_dialog.cc')
| -rw-r--r-- | gtk2_ardour/transcode_video_dialog.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/gtk2_ardour/transcode_video_dialog.cc b/gtk2_ardour/transcode_video_dialog.cc index 4d8b9b9f11..92265284c6 100644 --- a/gtk2_ardour/transcode_video_dialog.cc +++ b/gtk2_ardour/transcode_video_dialog.cc @@ -90,7 +90,7 @@ TranscodeVideoDialog::TranscodeVideoDialog (Session* s, std::string infile) int w = 0, h = 0; m_aspect = 4.0/3.0; - AudioStreams as; as.clear(); + TranscodeFfmpeg::FFAudioStreams as; as.clear(); path_hbox->pack_start (path_label, false, false, 3); path_hbox->pack_start (path_entry, true, true, 3); @@ -229,7 +229,7 @@ TranscodeVideoDialog::TranscodeVideoDialog (Session* s, std::string infile) t->attach (audio_combo, 1, 4, 2, 3); audio_combo.append_text("No audio"); if (as.size() > 0) { - for (AudioStreams::iterator it = as.begin(); it < as.end(); ++it) { + for (TranscodeFfmpeg::FFAudioStreams::iterator it = as.begin(); it < as.end(); ++it) { audio_combo.append_text((*it).name); } } |