]> git.sesse.net Git - casparcg/commitdiff
2.0. Added more image formats to image_producer.
authorronag <ronag@362d55ac-95cf-4e76-9f9a-cbaa9c17b72d>
Mon, 27 Jun 2011 12:36:57 +0000 (12:36 +0000)
committerronag <ronag@362d55ac-95cf-4e76-9f9a-cbaa9c17b72d>
Mon, 27 Jun 2011 12:36:57 +0000 (12:36 +0000)
git-svn-id: https://casparcg.svn.sourceforge.net/svnroot/casparcg/server/branches/2.0.0.2@961 362d55ac-95cf-4e76-9f9a-cbaa9c17b72d

modules/image/producer/image_producer.cpp

index d55da62f4248c77545e06e8162e9f9213f5a947c..d19a0fac2bab2567039849373c160d7863dfe672 100644 (file)
@@ -66,7 +66,7 @@ struct image_producer : public core::frame_producer
 \r
 safe_ptr<core::frame_producer> create_image_producer(const safe_ptr<core::frame_factory>& frame_factory, const std::vector<std::wstring>& params)\r
 {\r
-       static const std::vector<std::wstring> extensions = list_of(L"png")(L"tga")(L"bmp")(L"jpg")(L"jpeg");\r
+       static const std::vector<std::wstring> extensions = list_of(L"png")(L"tga")(L"bmp")(L"jpg")(L"jpeg")(L"gif")(L"tiff")(L"tif")(L"jp2")(L"jpx")(L"j2k")(L"j2c");\r
        std::wstring filename = env::media_folder() + L"\\" + params[0];\r
        \r
        auto ext = std::find_if(extensions.begin(), extensions.end(), [&](const std::wstring& ex) -> bool\r