2.0.0.2: ffmpeg: Print all hardware acceleration information.

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

diff --git a/modules/ffmpeg/ffmpeg.cpp b/modules/ffmpeg/ffmpeg.cpp
index 101ca809f77ea6bce050a23c8c1cb6649dab8849..1a7028e6e64f6c77007cd18ac25544c5bf9893ff 100644 (file)
--- a/modules/ffmpeg/ffmpeg.cpp
+++ b/modules/ffmpeg/ffmpeg.cpp
@@ -44,6 +44,13 @@ void init_ffmpeg()
 {\r
        av_register_all();\r
        avcodec_init();\r
+       \r
+    AVHWAccel* hwaccel = av_hwaccel_next(nullptr);
+    while(hwaccel != nullptr)
+       {
+       CASPAR_LOG(info) << "FFMPEG: Found HW-accelerated: " << hwaccel->name;
+          hwaccel = av_hwaccel_next(hwaccel);
+    }\r
 \r
        core::register_consumer_factory(create_ffmpeg_consumer);\r
        core::register_producer_factory(create_ffmpeg_producer);\r

diff --git a/shell/caspar.config b/shell/caspar.config
index 6af791bdb6f0d01606cfe9e4a2dc28b6d0964aad..895635706b1f4b96e331db4dcc83b54305d68389 100644 (file)
--- a/shell/caspar.config
+++ b/shell/caspar.config
@@ -20,11 +20,11 @@
           <latency>low</latency>\r
           <key>external</key>\r
         </decklink>\r
-        <ogl>\r
+        <!--<ogl>\r
           <device>0</device>\r
           <stretch>uniform</stretch>\r
           <windowed>true</windowed>\r
-        </ogl>\r
+        </ogl>-->\r
        <!-- <audio/>-->\r
         <!--<bluefish>\r
           <device>1</device>\r