From cddd5a812b0ec2db5dbdd120f6ed115ea9550bbb Mon Sep 17 00:00:00 2001 From: Carl Hetherington Date: Wed, 18 Dec 2013 11:04:26 +0000 Subject: Display description with all video content, not just FFmpeg. --- ChangeLog | 2 ++ src/wx/video_panel.cc | 4 ++-- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index 1f3097c87..d0bf184bf 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,7 @@ 2013-12-18 Carl Hetherington + * 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 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 vcs = vc.front (); + shared_ptr vcs = vc.front (); wxString d; -- cgit v1.2.3