diff mbox series

[FFmpeg-devel,13/13] lavc/svq3: stop including h264dec.h

Message ID 20220124170014.17189-13-anton@khirnov.net
State New
Headers show
Series [FFmpeg-devel,01/13] lavc/h264: replace MAX_MMCO_COUNT with H264_MAX_MMCO_COUNT | expand

Checks

Context Check Description
andriy/configure_armv7_RPi4 warning Failed to apply patch
andriy/configurex86 warning Failed to apply patch
andriy/configure_aarch64_jetson warning Failed to apply patch

Commit Message

Anton Khirnov Jan. 24, 2022, 5 p.m. UTC 
The only thing that is actually used directly from there is the
PART_NOT_AVAILABLE constant, which can be trivially copied to svq3
decoder itself.

Otherwise it only depends on other indirectly included headers.
---
 libavcodec/svq3.c | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

Comments

Andreas Rheinhardt Jan. 24, 2022, 5:08 p.m. UTC | #1 
Anton Khirnov:
> The only thing that is actually used directly from there is the
> PART_NOT_AVAILABLE constant, which can be trivially copied to svq3
> decoder itself.
> 
> Otherwise it only depends on other indirectly included headers.
> ---
>  libavcodec/svq3.c | 7 ++++++-
>  1 file changed, 6 insertions(+), 1 deletion(-)
> 
> diff --git a/libavcodec/svq3.c b/libavcodec/svq3.c
> index a3f434ff8d..f06404da9d 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>
> @@ -63,6 +66,8 @@
>  
>  #include "svq1.h"
>  
> +#define PART_NOT_AVAILABLE -2
> +
>  /**
>   * @file
>   * svq3 decoder.

I think a better place for this is h264pred.h.

- Andreas
diff mbox series

Patch

diff --git a/libavcodec/svq3.c b/libavcodec/svq3.c
index a3f434ff8d..f06404da9d 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>
@@ -63,6 +66,8 @@ 
 
 #include "svq1.h"
 
+#define PART_NOT_AVAILABLE -2
+
 /**
  * @file
  * svq3 decoder.