From d0f0d613926550ebf293e1d32f7a395fa0a88aed Mon Sep 17 00:00:00 2001
From: Anton Khirnov <anton@khirnov.net>
Date: Mon, 24 Jan 2022 18:00:14 +0100
Subject: [PATCH] lavc/svq3: stop including h264dec.h

The only thing that is actually used directly from there is the
PART_NOT_AVAILABLE constant, which can be moved to h264pred.h.

Otherwise it only depends on other indirectly included headers.
---
 libavcodec/h264dec.h  | 1 -
 libavcodec/h264pred.h | 2 ++
 libavcodec/svq3.c     | 5 ++++-
 3 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/libavcodec/h264dec.h b/libavcodec/h264dec.h
index f623d60893..23060145cd 100644
--- a/libavcodec/h264dec.h
+++ b/libavcodec/h264dec.h
@@ -387,7 +387,6 @@ typedef struct H264Context {
     uint8_t (*non_zero_count)[48];
 
 #define LIST_NOT_USED -1 // FIXME rename?
-#define PART_NOT_AVAILABLE -2
 
     /**
      * block_offset[ 0..23] for frame macroblocks
diff --git a/libavcodec/h264pred.h b/libavcodec/h264pred.h
index 4583052dfe..cb008548fc 100644
--- a/libavcodec/h264pred.h
+++ b/libavcodec/h264pred.h
@@ -86,6 +86,8 @@
 #define DC_129_PRED8x8         8
 //@}
 
+#define PART_NOT_AVAILABLE -2
+
 /**
  * Context for storing H.264 prediction functions
  */
diff --git a/libavcodec/svq3.c b/libavcodec/svq3.c
index a3f434ff8d..be95e222aa 100644
--- a/libavcodec/svq3.c
+++ b/libavcodec/svq3.c
@@ -49,13 +49,16 @@
 #include "internal.h"
 #include "avcodec.h"
 #include "mpegutils.h"
-#include "h264dec.h"
 #include "h264data.h"
+#include "h264dsp.h"
+#include "h264pred.h"
+#include "h264_parse.h"
 #include "golomb.h"
 #include "hpeldsp.h"
 #include "mathops.h"
 #include "rectangle.h"
 #include "tpeldsp.h"
+#include "videodsp.h"
 
 #if CONFIG_ZLIB
 #include <zlib.h>