[FFmpeg-devel] [PATCH 31/48] avcodec/mpegvideo: Add missing headers

[Andreas Rheinhardt <ffmpegagent-at-gmail.com@ffmpeg.org>]

From: Andreas Rheinhardt <andreas.rheinhardt@outlook.com>

These files currently rely on implicit inclusions of avassert.h
and/or mathops.h via get_bits.h.

Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@outlook.com>
---
 libavcodec/error_resilience.c          | 2 ++
 libavcodec/me_cmp.c                    | 1 +
 libavcodec/mips/mpegvideo_msa.c        | 1 +
 libavcodec/mpeg4videoenc.c             | 1 +
 libavcodec/mpegvideo.c                 | 1 +
 libavcodec/msmpeg4.c                   | 1 +
 libavcodec/ppc/mpegvideo_altivec.c     | 1 +
 libavcodec/speedhqenc.c                | 1 +
 libavcodec/x86/mpegvideo.c             | 2 +-
 libavcodec/x86/mpegvideoenc.c          | 1 -
 libavcodec/x86/mpegvideoenc_template.c | 1 +
 11 files changed, 11 insertions(+), 2 deletions(-)

diff --git a/libavcodec/error_resilience.c b/libavcodec/error_resilience.c
index 6edc2dc15f..cf6f83e096 100644
--- a/libavcodec/error_resilience.c
+++ b/libavcodec/error_resilience.c
@@ -27,9 +27,11 @@
 
 #include <limits.h>
 
+#include "libavutil/avassert.h"
 #include "libavutil/mem.h"
 #include "avcodec.h"
 #include "error_resilience.h"
+#include "mathops.h"
 #include "me_cmp.h"
 #include "mpegutils.h"
 #include "mpegvideo.h"
diff --git a/libavcodec/me_cmp.c b/libavcodec/me_cmp.c
index 419b8d30c9..8e53f6d573 100644
--- a/libavcodec/me_cmp.c
+++ b/libavcodec/me_cmp.c
@@ -27,6 +27,7 @@
 #include "libavutil/mem_internal.h"
 #include "avcodec.h"
 #include "copy_block.h"
+#include "mathops.h"
 #include "simple_idct.h"
 #include "me_cmp.h"
 #include "mpegvideoenc.h"
diff --git a/libavcodec/mips/mpegvideo_msa.c b/libavcodec/mips/mpegvideo_msa.c
index aa9ef770eb..cd4adc0f77 100644
--- a/libavcodec/mips/mpegvideo_msa.c
+++ b/libavcodec/mips/mpegvideo_msa.c
@@ -18,6 +18,7 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
+#include "libavutil/avassert.h"
 #include "libavutil/mips/generic_macros_msa.h"
 #include "h263dsp_mips.h"
 
diff --git a/libavcodec/mpeg4videoenc.c b/libavcodec/mpeg4videoenc.c
index 1aa35aa70a..540ab8e4c3 100644
--- a/libavcodec/mpeg4videoenc.c
+++ b/libavcodec/mpeg4videoenc.c
@@ -29,6 +29,7 @@
 #include "mpegvideo.h"
 #include "h263.h"
 #include "h263enc.h"
+#include "mathops.h"
 #include "mpeg4video.h"
 #include "mpeg4videodata.h"
 #include "mpeg4videodefs.h"
diff --git a/libavcodec/mpegvideo.c b/libavcodec/mpegvideo.c
index ae294e9dd8..7ef0dacc80 100644
--- a/libavcodec/mpegvideo.c
+++ b/libavcodec/mpegvideo.c
@@ -31,6 +31,7 @@
 #include "libavutil/avassert.h"
 #include "libavutil/imgutils.h"
 #include "libavutil/internal.h"
+#include "libavutil/intreadwrite.h"
 #include "libavutil/mem.h"
 
 #include "avcodec.h"
diff --git a/libavcodec/msmpeg4.c b/libavcodec/msmpeg4.c
index 740dbdcba8..3073ca6193 100644
--- a/libavcodec/msmpeg4.c
+++ b/libavcodec/msmpeg4.c
@@ -36,6 +36,7 @@
 
 #include "avcodec.h"
 #include "idctdsp.h"
+#include "mathops.h"
 #include "mpegvideo.h"
 #include "msmpeg4.h"
 #include "mpeg4videodata.h"
diff --git a/libavcodec/ppc/mpegvideo_altivec.c b/libavcodec/ppc/mpegvideo_altivec.c
index 8cc213efe4..26e98acfb8 100644
--- a/libavcodec/ppc/mpegvideo_altivec.c
+++ b/libavcodec/ppc/mpegvideo_altivec.c
@@ -27,6 +27,7 @@
 #include "config.h"
 
 #include "libavutil/attributes.h"
+#include "libavutil/avassert.h"
 #include "libavutil/cpu.h"
 #include "libavutil/mem_internal.h"
 #include "libavutil/ppc/cpu.h"
diff --git a/libavcodec/speedhqenc.c b/libavcodec/speedhqenc.c
index 23ab86e8e2..da7aba6ec9 100644
--- a/libavcodec/speedhqenc.c
+++ b/libavcodec/speedhqenc.c
@@ -32,6 +32,7 @@
 
 #include "avcodec.h"
 #include "codec_internal.h"
+#include "mathops.h"
 #include "mpeg12data.h"
 #include "mpeg12vlc.h"
 #include "mpegvideo.h"
diff --git a/libavcodec/x86/mpegvideo.c b/libavcodec/x86/mpegvideo.c
index 24f1e14007..8632acd412 100644
--- a/libavcodec/x86/mpegvideo.c
+++ b/libavcodec/x86/mpegvideo.c
@@ -20,10 +20,10 @@
  */
 
 #include "libavutil/attributes.h"
+#include "libavutil/avassert.h"
 #include "libavutil/cpu.h"
 #include "libavutil/x86/asm.h"
 #include "libavutil/x86/cpu.h"
-#include "libavcodec/avcodec.h"
 #include "libavcodec/mpegvideo.h"
 #include "libavcodec/mpegvideodata.h"
 #include "libavcodec/mpegvideo_unquantize.h"
diff --git a/libavcodec/x86/mpegvideoenc.c b/libavcodec/x86/mpegvideoenc.c
index d81a8ef14d..eac9947590 100644
--- a/libavcodec/x86/mpegvideoenc.c
+++ b/libavcodec/x86/mpegvideoenc.c
@@ -25,7 +25,6 @@
 #include "libavutil/x86/asm.h"
 #include "libavutil/x86/cpu.h"
 #include "libavcodec/avcodec.h"
-#include "libavcodec/dct.h"
 #include "libavcodec/mpegvideoenc.h"
 
 /* not permutated inverse zigzag_direct + 1 for MMX quantizer */
diff --git a/libavcodec/x86/mpegvideoenc_template.c b/libavcodec/x86/mpegvideoenc_template.c
index dbb2187121..f0b95c1621 100644
--- a/libavcodec/x86/mpegvideoenc_template.c
+++ b/libavcodec/x86/mpegvideoenc_template.c
@@ -25,6 +25,7 @@
 #include "libavutil/internal.h"
 #include "libavutil/mem_internal.h"
 #include "libavutil/x86/asm.h"
+#include "libavcodec/mathops.h"
 #include "libavcodec/mpegutils.h"
 #include "libavcodec/mpegvideoenc.h"
 #include "fdct.h"
-- 
ffmpeg-codebot

_______________________________________________
ffmpeg-devel mailing list
ffmpeg-devel@ffmpeg.org
https://ffmpeg.org/mailman/listinfo/ffmpeg-devel

To unsubscribe, visit link above, or email
ffmpeg-devel-request@ffmpeg.org with subject "unsubscribe".