diff options
| author | Carl Hetherington <cth@carlh.net> | 2013-12-18 11:04:26 +0000 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2013-12-18 11:04:26 +0000 |
| commit | cddd5a812b0ec2db5dbdd120f6ed115ea9550bbb (patch) | |
| tree | df9750046d76dd199e686e27ed4c16137a6001fa | |
| parent | 03b54137dc7b35594a38f5d2bbe702d3876544f7 (diff) | |
Display description with all video content, not just FFmpeg.
| -rw-r--r-- | ChangeLog | 2 | ||||
| -rw-r--r-- | src/wx/video_panel.cc | 4 |
2 files changed, 4 insertions, 2 deletions
@@ -1,5 +1,7 @@ 2013-12-18 Carl Hetherington <cth@carlh.net> + * Restore video information in video tab when using still images. + * Hopefully fix exception on new film in some strange cases. 2013-12-09 Carl Hetherington <cth@carlh.net> diff --git a/src/wx/video_panel.cc b/src/wx/video_panel.cc index 5d841b0cc..8609322ce 100644 --- a/src/wx/video_panel.cc +++ b/src/wx/video_panel.cc @@ -271,7 +271,7 @@ VideoPanel::edit_filters_clicked () void VideoPanel::setup_description () { - FFmpegContentList vc = _editor->selected_ffmpeg_content (); + VideoContentList vc = _editor->selected_video_content (); if (vc.empty ()) { _description->SetLabel (""); return; @@ -280,7 +280,7 @@ VideoPanel::setup_description () return; } - shared_ptr<FFmpegContent> vcs = vc.front (); + shared_ptr<VideoContent> vcs = vc.front (); wxString d; |