Merge branch 'development' into LTS_development

2017-04-18 12:32:39 +02:00 · 2017-04-18 12:32:39 +02:00 · 7629b00a4c
commit 7629b00a4c
parent 29cc6c15f8 a7718c78e9
10 changed files with 65 additions and 17 deletions
--- a/lib/h264.cpp
+++ b/lib/h264.cpp
@ -155,6 +155,8 @@ namespace h264 {
        unsigned int timeScale = bs.get(32);
        result.fps = (double)timeScale / (2 * unitsInTick);
        bs.skip(1);
+      }else{
+        result.fps = 0;
      }
    }