Commit ca0338b4 authored by François Grisez's avatar François Grisez

Fix build with GCC

* -Wdeclaration-after-statement compliance. This warning should be
  relaxed maybe.
* Add missing header include for bitset template.
parent 70cf3765
......@@ -17,6 +17,8 @@
Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
*/
#include <bitset>
#include "nal-unpacker.h"
using namespace std;
......
......@@ -225,11 +225,11 @@ static void video_stream_track_fps_changes(VideoStream *stream){
if (ms_filter_call_method(stream->source,MS_FILTER_GET_FPS,&fps)==0 && fps!=0){
if (fabsf(fps-stream->configured_fps)/stream->configured_fps>0.2){
MSVideoConfiguration vconf;
ms_warning("Measured and target fps significantly different (%f<->%f), updating encoder.",
fps,stream->configured_fps);
stream->real_fps=fps;
MSVideoConfiguration vconf;
ms_filter_call_method(stream->ms.encoder,MS_VIDEO_ENCODER_GET_CONFIGURATION,&vconf);
vconf.fps = stream->real_fps;
ms_filter_call_method(stream->ms.encoder,MS_VIDEO_ENCODER_SET_CONFIGURATION,&vconf);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment