[FFmpeg-devel] [PATCH] avdevice/fbdev_common: fix compilation with older kernels

Ingo Brückl ib at wupperonline.de
Thu Oct 24 16:36:56 CEST 2013


This will avoid errors due to conflicting declarations
with linux kernels prior to 2.6.30.

Signed-off-by: Ingo Brückl <ib at wupperonline.de>
---
 libavdevice/fbdev_common.h |    6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/libavdevice/fbdev_common.h b/libavdevice/fbdev_common.h
index ecbb825..c3ed8d0 100644
--- a/libavdevice/fbdev_common.h
+++ b/libavdevice/fbdev_common.h
@@ -23,8 +23,12 @@
 #ifndef AVDEVICE_FBDEV_COMMON_H
 #define AVDEVICE_FBDEV_COMMON_H

-#include <linux/fb.h>
 #include "libavutil/pixfmt.h"
+#ifndef __KERNEL_STRICT_NAMES
+#define __KERNEL_STRICT_NAMES
+#include <linux/fb.h>
+#undef __KERNEL_STRICT_NAMES
+#endif

 enum AVPixelFormat ff_get_pixfmt_from_fb_varinfo(struct fb_var_screeninfo *varinfo);

--
1.7.10



More information about the ffmpeg-devel mailing list