2.0. Print video-codec names.

git-svn-id: https://casparcg.svn.sourceforge.net/svnroot/casparcg/server/branches/2.0.0.2@896 362d55ac-95cf-4e76-9f9a-cbaa9c17b72d

diff --git a/modules/ffmpeg/producer/input.cpp b/modules/ffmpeg/producer/input.cpp
index 1c66eaa4e967f19603cc1bced2395924546b1ffb..b127f3cc456fb0284b13f708260b6804e88fc903 100644 (file)
--- a/modules/ffmpeg/producer/input.cpp
+++ b/modules/ffmpeg/producer/input.cpp
@@ -113,7 +113,7 @@ public:
 \r
        int index() const {return index_;}\r
        \r
-       const std::shared_ptr<AVCodecContext>& ctx() { return ctx_; }\r
+       const std::shared_ptr<AVCodecContext>& ctx() const { return ctx_; }\r
 \r
        operator bool(){return ctx_ != nullptr;}\r
 \r
@@ -355,7 +355,10 @@ private:
        \r
        std::wstring print() const\r
        {\r
-               return L"ffmpeg_input[" + filename_ + L"]";\r
+               const auto video = widen(video_stream_.ctx() ? video_stream_.ctx()->codec->name : "no-video");\r
+               const auto audio = widen(audio_stream_.ctx() ? audio_stream_.ctx()->codec->name : "no-audio");\r
+\r
+               return L"ffmpeg_input[" + filename_ + L" (" + video + L"|" + audio + L")]";\r
        }\r
 };\r
 \r