Display description with all video content, not just FFmpeg.

diff --git a/ChangeLog b/ChangeLog
index 1f3097c87d1e1fc8a38e8507124cd1481c3597e6..d0bf184bf24d5bcf8b4a3b53e70b77d3d3c6d9b1 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -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 5d841b0cc45d6c5b5c3481076e85c657febc16c4..8609322ceb6bbeb895f602bae030011aa26cedc2 100644 (file)
--- 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;