[FFmpeg-devel] [PATCHSET] fix make checkheaders + misc header fixes
Clément Bœsch
ubitux at gmail.com
Sun May 13 21:35:14 CEST 2012
Here is the new version of the patchset. Since a bunch of these patches
were already validated in the previous version, and these patches are
pretty small, I'm attaching all of them in this mail. It will also avoid
some random noise.
Comments welcome before I push.
--
Clément B.
-------------- next part --------------
From 0d865cb95a08c75399358fca5c01ee04a4190ede Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Cl=C3=A9ment=20B=C5=93sch?= <ubitux at gmail.com>
Date: Wed, 9 May 2012 08:11:16 +0200
Subject: [PATCH 01/16] lavd/dshow: protect header.
---
libavdevice/dshow.h | 5 +++++
1 file changed, 5 insertions(+)
diff --git a/libavdevice/dshow.h b/libavdevice/dshow.h
index 83c71c4..a3f5231 100644
--- a/libavdevice/dshow.h
+++ b/libavdevice/dshow.h
@@ -19,6 +19,9 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/
+#ifndef AVDEVICE_DSHOW_H
+#define AVDEVICE_DSHOW_H
+
#define DSHOWDEBUG 0
#include "avdevice.h"
@@ -266,3 +269,5 @@ long WINAPI libAVFilter_QueryVendorInfo(libAVFilter *, wchar_t **);
void libAVFilter_Destroy(libAVFilter *);
libAVFilter *libAVFilter_Create (void *, void *, enum dshowDeviceType);
+
+#endif /* AVDEVICE_DSHOW_H */
--
1.7.10.1
-------------- next part --------------
From 9daafd5869e34d99d7a5d311afafa940193a0cde Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Cl=C3=A9ment=20B=C5=93sch?= <ubitux at gmail.com>
Date: Wed, 9 May 2012 08:14:44 +0200
Subject: [PATCH 02/16] lavd/dshow: fix make checkheaders.
---
libavdevice/Makefile | 1 +
1 file changed, 1 insertion(+)
diff --git a/libavdevice/Makefile b/libavdevice/Makefile
index 8544179..94da355 100644
--- a/libavdevice/Makefile
+++ b/libavdevice/Makefile
@@ -38,6 +38,7 @@ OBJS-$(CONFIG_X11_GRAB_DEVICE_INDEV) += x11grab.o
OBJS-$(CONFIG_LIBCDIO_INDEV) += libcdio.o
OBJS-$(CONFIG_LIBDC1394_INDEV) += libdc1394.o
+SKIPHEADERS-$(CONFIG_DSHOW_INDEV) += dshow.h
SKIPHEADERS-$(HAVE_ALSA_ASOUNDLIB_H) += alsa-audio.h
SKIPHEADERS-$(HAVE_SNDIO_H) += sndio_common.h
--
1.7.10.1
-------------- next part --------------
From 53611eaf7dacb6c7abf0b499b7955a362b92d96c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Cl=C3=A9ment=20B=C5=93sch?= <ubitux at gmail.com>
Date: Wed, 9 May 2012 08:15:27 +0200
Subject: [PATCH 03/16] lavfi/transform: fix make checkheaders.
---
libavfilter/transform.h | 2 ++
1 file changed, 2 insertions(+)
diff --git a/libavfilter/transform.h b/libavfilter/transform.h
index 701c833..edd0cf2 100644
--- a/libavfilter/transform.h
+++ b/libavfilter/transform.h
@@ -22,6 +22,8 @@
#ifndef AVFILTER_TRANSFORM_H
#define AVFILTER_TRANSFORM_H
+#include <stdint.h>
+
/**
* @file
* transform input video
--
1.7.10.1
-------------- next part --------------
From 66d85f7a1c8f6e6ab69cf4884a89365cea1b1fed Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Cl=C3=A9ment=20B=C5=93sch?= <ubitux at gmail.com>
Date: Wed, 9 May 2012 08:22:06 +0200
Subject: [PATCH 04/16] lavfi: rename all_channel_layouts.h to
all_channel_layouts.inc.
all_channel_layouts.h is not a real header file and breaks make checkheaders.
---
libavfilter/{all_channel_layouts.h => all_channel_layouts.inc} | 0
libavfilter/formats.c | 2 +-
2 files changed, 1 insertion(+), 1 deletion(-)
rename libavfilter/{all_channel_layouts.h => all_channel_layouts.inc} (100%)
diff --git a/libavfilter/all_channel_layouts.h b/libavfilter/all_channel_layouts.inc
similarity index 100%
rename from libavfilter/all_channel_layouts.h
rename to libavfilter/all_channel_layouts.inc
diff --git a/libavfilter/formats.c b/libavfilter/formats.c
index 569178f..f43e23d 100644
--- a/libavfilter/formats.c
+++ b/libavfilter/formats.c
@@ -195,7 +195,7 @@ AVFilterFormats *avfilter_make_all_formats(enum AVMediaType type)
}
const int64_t avfilter_all_channel_layouts[] = {
-#include "all_channel_layouts.h"
+#include "all_channel_layouts.inc"
-1
};
--
1.7.10.1
-------------- next part --------------
From 9eab3d7009b965282177a3468214a0c0f9098bfb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Cl=C3=A9ment=20B=C5=93sch?= <ubitux at gmail.com>
Date: Wed, 9 May 2012 08:25:49 +0200
Subject: [PATCH 05/16] lavf/swf: fix make checkheaders.
---
libavformat/swf.h | 2 ++
1 file changed, 2 insertions(+)
diff --git a/libavformat/swf.h b/libavformat/swf.h
index 8a99c96..5326192 100644
--- a/libavformat/swf.h
+++ b/libavformat/swf.h
@@ -23,6 +23,8 @@
#ifndef AVFORMAT_SWF_H
#define AVFORMAT_SWF_H
+#include "config.h"
+
#if CONFIG_ZLIB
#include <zlib.h>
#endif
--
1.7.10.1
-------------- next part --------------
From be450a0d737ecef4b5e4440ef2531c888f91aa9d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Cl=C3=A9ment=20B=C5=93sch?= <ubitux at gmail.com>
Date: Wed, 9 May 2012 08:27:51 +0200
Subject: [PATCH 06/16] lavc/g729postfilter: fix make checkheaders.
---
libavcodec/g729postfilter.h | 1 +
1 file changed, 1 insertion(+)
diff --git a/libavcodec/g729postfilter.h b/libavcodec/g729postfilter.h
index 0ccecb2..5239fc8 100644
--- a/libavcodec/g729postfilter.h
+++ b/libavcodec/g729postfilter.h
@@ -22,6 +22,7 @@
#define FFMPEG_G729POSTFILTER_H
#include <stdint.h>
+#include "dsputil.h"
/**
* tilt compensation factor (G.729, k1>0)
--
1.7.10.1
-------------- next part --------------
From 9b9d9d40f2044ee9a9eb17002918079f21b55d7b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Cl=C3=A9ment=20B=C5=93sch?= <ubitux at gmail.com>
Date: Wed, 9 May 2012 08:31:54 +0200
Subject: [PATCH 07/16] lavc/g723: protect header.
---
libavcodec/g723_1_data.h | 5 +++++
1 file changed, 5 insertions(+)
diff --git a/libavcodec/g723_1_data.h b/libavcodec/g723_1_data.h
index bd1abe9..24d154f 100644
--- a/libavcodec/g723_1_data.h
+++ b/libavcodec/g723_1_data.h
@@ -25,6 +25,9 @@
* G723.1 compatible decoder data tables
*/
+#ifndef AVCODEC_G729_DATA_H
+#define AVCODEC_G729_DATA_H
+
#define SUBFRAMES 4
#define SUBFRAME_LEN 60
#define FRAME_LEN (SUBFRAME_LEN << 2)
@@ -1313,3 +1316,5 @@ static const int16_t percept_flt_tbl[2][LPC_ORDER] = {
/* Pole part */
{16384, 8192, 4096, 2048, 1024, 512, 256, 128, 64, 32}
};
+
+#endif /* AVCODEC_G729_DATA_H */
--
1.7.10.1
-------------- next part --------------
From ae25d173818a4c62e5049d1d323c340c3ed09010 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Cl=C3=A9ment=20B=C5=93sch?= <ubitux at gmail.com>
Date: Wed, 9 May 2012 08:32:31 +0200
Subject: [PATCH 08/16] lavc/g723.1: fix make checkheaders.
---
libavcodec/g723_1_data.h | 2 ++
1 file changed, 2 insertions(+)
diff --git a/libavcodec/g723_1_data.h b/libavcodec/g723_1_data.h
index 24d154f..34221e3 100644
--- a/libavcodec/g723_1_data.h
+++ b/libavcodec/g723_1_data.h
@@ -28,6 +28,8 @@
#ifndef AVCODEC_G729_DATA_H
#define AVCODEC_G729_DATA_H
+#include <stdint.h>
+
#define SUBFRAMES 4
#define SUBFRAME_LEN 60
#define FRAME_LEN (SUBFRAME_LEN << 2)
--
1.7.10.1
-------------- next part --------------
From aa3305272bc15bf6b6d7e4b977c64d98a0946658 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Cl=C3=A9ment=20B=C5=93sch?= <ubitux at gmail.com>
Date: Wed, 9 May 2012 08:33:06 +0200
Subject: [PATCH 09/16] lavc/dcaenc: fix make checkheaders.
---
libavcodec/dcaenc.h | 2 ++
1 file changed, 2 insertions(+)
diff --git a/libavcodec/dcaenc.h b/libavcodec/dcaenc.h
index 63d03dc..121e5da 100644
--- a/libavcodec/dcaenc.h
+++ b/libavcodec/dcaenc.h
@@ -22,6 +22,8 @@
#ifndef AVCODEC_DCAENC_H
#define AVCODEC_DCAENC_H
+#include <stdint.h>
+
/* This is a scaled version of the response of the reference decoder to
this vector of subband samples: ( 1.0 0.0 0.0 ... 0.0 )
*/
--
1.7.10.1
-------------- next part --------------
From e42a27cf026d0cf32ffa4cb2580663d0c3e6cc56 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Cl=C3=A9ment=20B=C5=93sch?= <ubitux at gmail.com>
Date: Wed, 9 May 2012 09:04:04 +0200
Subject: [PATCH 10/16] lavc/jacosub: fix make checkheaders.
---
libavcodec/jacosub.h | 2 ++
1 file changed, 2 insertions(+)
diff --git a/libavcodec/jacosub.h b/libavcodec/jacosub.h
index 410969e..c3665ae 100644
--- a/libavcodec/jacosub.h
+++ b/libavcodec/jacosub.h
@@ -26,6 +26,8 @@
#ifndef AVCODEC_JACOSUB_H
#define AVCODEC_JACOSUB_H
+#include "libavutil/common.h"
+
#define JSS_MAX_LINESIZE 512
static av_always_inline int jss_whitespace(char c)
--
1.7.10.1
-------------- next part --------------
From bd32ead0893fbd4e71844a3c43e511827ea9cea4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Cl=C3=A9ment=20B=C5=93sch?= <ubitux at gmail.com>
Date: Wed, 9 May 2012 09:06:06 +0200
Subject: [PATCH 11/16] lavc/libutvideo: protect header.
---
libavcodec/libutvideo.h | 5 +++++
1 file changed, 5 insertions(+)
diff --git a/libavcodec/libutvideo.h b/libavcodec/libutvideo.h
index 0b98b7c..a9387e1 100644
--- a/libavcodec/libutvideo.h
+++ b/libavcodec/libutvideo.h
@@ -24,6 +24,9 @@
* 'ULY0' (YCbCr 4:2:0), 'ULY2' (YCbCr 4:2:2), 'ULRG' (RGB), 'ULRA' (RGBA)
*/
+#ifndef AVCODEC_LIBUTVIDEO_H
+#define AVCODEC_LIBUTVIDEO_H
+
#include <stdlib.h>
#include <utvideo/utvideo.h>
#include <utvideo/Codec.h>
@@ -40,3 +43,5 @@ typedef struct {
unsigned int buf_size;
uint8_t *buffer;
} UtVideoContext;
+
+#endif /* AVCODEC_LIBUTVIDEO_H */
--
1.7.10.1
-------------- next part --------------
From c21c991aa892c03406a2eb4cc2a81fd577cfc908 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Cl=C3=A9ment=20B=C5=93sch?= <ubitux at gmail.com>
Date: Wed, 9 May 2012 09:06:54 +0200
Subject: [PATCH 12/16] lavc/libutvideo: fix make checkheaders.
---
libavcodec/Makefile | 1 +
1 file changed, 1 insertion(+)
diff --git a/libavcodec/Makefile b/libavcodec/Makefile
index 41cc9c2..4bdd021 100644
--- a/libavcodec/Makefile
+++ b/libavcodec/Makefile
@@ -764,6 +764,7 @@ SKIPHEADERS += %_tablegen.h \
SKIPHEADERS-$(CONFIG_DXVA2) += dxva2.h dxva2_internal.h
SKIPHEADERS-$(CONFIG_LIBSCHROEDINGER) += libschroedinger.h
+SKIPHEADERS-$(CONFIG_LIBUTVIDEO) += libutvideo.h
SKIPHEADERS-$(CONFIG_MPEG_XVMC_DECODER) += xvmc.h
SKIPHEADERS-$(CONFIG_VAAPI) += vaapi_internal.h
SKIPHEADERS-$(CONFIG_VDA) += vda_internal.h
--
1.7.10.1
-------------- next part --------------
From 549c2e22d9e5dcf57f046683d3bb5b2ad094e266 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Cl=C3=A9ment=20B=C5=93sch?= <ubitux at gmail.com>
Date: Wed, 9 May 2012 09:10:24 +0200
Subject: [PATCH 13/16] lavc/os2threads: fix make checkheaders.
---
libavcodec/Makefile | 1 +
1 file changed, 1 insertion(+)
diff --git a/libavcodec/Makefile b/libavcodec/Makefile
index 4bdd021..1143799 100644
--- a/libavcodec/Makefile
+++ b/libavcodec/Makefile
@@ -769,6 +769,7 @@ SKIPHEADERS-$(CONFIG_MPEG_XVMC_DECODER) += xvmc.h
SKIPHEADERS-$(CONFIG_VAAPI) += vaapi_internal.h
SKIPHEADERS-$(CONFIG_VDA) += vda_internal.h
SKIPHEADERS-$(CONFIG_VDPAU) += vdpau.h
+SKIPHEADERS-$(HAVE_OS2THREADS) += os2threads.h
SKIPHEADERS-$(HAVE_W32THREADS) += w32pthreads.h
TESTPROGS = cabac \
--
1.7.10.1
-------------- next part --------------
From fd957b1ceef1019b36b1c53020a8ec2c29cda901 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Cl=C3=A9ment=20B=C5=93sch?= <ubitux at gmail.com>
Date: Sun, 13 May 2012 21:19:55 +0200
Subject: [PATCH 14/16] lavc/vda: fix make checkheaders.
---
libavcodec/Makefile | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/libavcodec/Makefile b/libavcodec/Makefile
index 1143799..22c5941 100644
--- a/libavcodec/Makefile
+++ b/libavcodec/Makefile
@@ -767,7 +767,7 @@ SKIPHEADERS-$(CONFIG_LIBSCHROEDINGER) += libschroedinger.h
SKIPHEADERS-$(CONFIG_LIBUTVIDEO) += libutvideo.h
SKIPHEADERS-$(CONFIG_MPEG_XVMC_DECODER) += xvmc.h
SKIPHEADERS-$(CONFIG_VAAPI) += vaapi_internal.h
-SKIPHEADERS-$(CONFIG_VDA) += vda_internal.h
+SKIPHEADERS-$(CONFIG_VDA) += vda.h vda_internal.h
SKIPHEADERS-$(CONFIG_VDPAU) += vdpau.h
SKIPHEADERS-$(HAVE_OS2THREADS) += os2threads.h
SKIPHEADERS-$(HAVE_W32THREADS) += w32pthreads.h
--
1.7.10.1
-------------- next part --------------
From b0f038d8b11516734f6f80ecb9bde6522dbc62c3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Cl=C3=A9ment=20B=C5=93sch?= <ubitux at gmail.com>
Date: Sun, 13 May 2012 21:10:54 +0200
Subject: [PATCH 15/16] build: add codec_names.h to SKIPHEADERS to fix make
checkheaders.
---
libavcodec/Makefile | 1 +
1 file changed, 1 insertion(+)
diff --git a/libavcodec/Makefile b/libavcodec/Makefile
index 22c5941..f67952e 100644
--- a/libavcodec/Makefile
+++ b/libavcodec/Makefile
@@ -758,6 +758,7 @@ OBJS-$(!CONFIG_SMALL) += inverse.o
SKIPHEADERS += %_tablegen.h \
%_tables.h \
aac_tablegen_decl.h \
+ codec_names.h \
fft-internal.h \
tableprint.h \
$(ARCH)/vp56_arith.h \
--
1.7.10.1
-------------- next part --------------
From d9e6dad1f4afb2c9cad0d7edfca8a51f78e3c2e4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Cl=C3=A9ment=20B=C5=93sch?= <ubitux at gmail.com>
Date: Wed, 9 May 2012 09:57:33 +0200
Subject: [PATCH 16/16] lavu/error: fix make checkheaders.
The errors need to be defined before including functions depending on
them. See av_size_mult() for instance. stddef.h is included for the
prototype of av_sterror (use of size_t).
---
libavutil/error.h | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/libavutil/error.h b/libavutil/error.h
index 3b05e4b..316734f 100644
--- a/libavutil/error.h
+++ b/libavutil/error.h
@@ -25,7 +25,7 @@
#define AVUTIL_ERROR_H
#include <errno.h>
-#include "avutil.h"
+#include <stddef.h>
/**
* @addtogroup lavu_error
--
1.7.10.1
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 490 bytes
Desc: not available
URL: <http://ffmpeg.org/pipermail/ffmpeg-devel/attachments/20120513/7de217d5/attachment.asc>
More information about the ffmpeg-devel
mailing list