From: Steinar H. Gunderson <sgunderson@bigfoot.com>
Date: Tue, 2 Aug 2016 21:04:06 +0000 (+0200)
Subject: ffmpeg #includes need to be in extern blocks.
X-Git-Tag: 1.4.0~147
X-Git-Url: https://git.sesse.net/?a=commitdiff_plain;h=c93d4d8a7e35f5e53868a938f1a216792c391598;p=nageru

ffmpeg #includes need to be in extern blocks.
---

diff --git a/quicksync_encoder.cpp b/quicksync_encoder.cpp
index 55a0eab..cc4020f 100644
--- a/quicksync_encoder.cpp
+++ b/quicksync_encoder.cpp
@@ -1,4 +1,3 @@
-//#include "sysdeps.h"
 #include "quicksync_encoder.h"
 
 #include <movit/resource_pool.h>  // Must be above the Xlib includes.
@@ -9,10 +8,6 @@
 #include <assert.h>
 #include <epoxy/egl.h>
 #include <fcntl.h>
-#include <libavcodec/avcodec.h>
-#include <libavformat/avio.h>
-#include <libavutil/error.h>
-#include <libdrm/drm_fourcc.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
@@ -35,6 +30,15 @@
 #include <thread>
 #include <utility>
 
+extern "C" {
+
+#include <libavcodec/avcodec.h>
+#include <libavformat/avio.h>
+#include <libavutil/error.h>
+#include <libdrm/drm_fourcc.h>
+
+}  // namespace
+
 #include "audio_encoder.h"
 #include "context.h"
 #include "defs.h"