2.0.0.2: ffmpeg_input: Assume EIO is AVERROR_EOF since it is sometimes returned inste...

[casparcg] / modules / ffmpeg / ffmpeg.cpp

diff --git a/modules/ffmpeg/ffmpeg.cpp b/modules/ffmpeg/ffmpeg.cpp
index 69bd866d867f0177a93a83ff59eab7fde1b894b5..26aec9664b726b36e6f7b8856a5d83f6b5b89944 100644 (file)
--- a/modules/ffmpeg/ffmpeg.cpp
+++ b/modules/ffmpeg/ffmpeg.cpp
@@ -35,6 +35,8 @@ extern "C"
        #define __STDC_LIMIT_MACROS\r
        #include <libavformat/avformat.h>\r
        #include <libswscale/swscale.h>\r
+       #include <libavutil/avutil.h>\r
+       #include <libavfilter/avfilter.h>\r
 }\r
 \r
 namespace caspar {\r
@@ -62,6 +64,20 @@ std::wstring get_avformat_version()
        return str.str();\r
 }\r
 \r
+std::wstring get_avutil_version()\r
+{\r
+       std::wstringstream str;\r
+       str << ((avutil_version() >> 16) & 0xFF) << L"." << ((avutil_version() >> 8) & 0xFF) << L"." << ((avutil_version() >> 0) & 0xFF);\r
+       return str.str();\r
+}\r
+\r
+std::wstring get_avfilter_version()\r
+{\r
+       std::wstringstream str;\r
+       str << ((avfilter_version() >> 16) & 0xFF) << L"." << ((avfilter_version() >> 8) & 0xFF) << L"." << ((avfilter_version() >> 0) & 0xFF);\r
+       return str.str();\r
+}\r
+\r
 std::wstring get_swscale_version()\r
 {\r
        std::wstringstream str;\r