[FFmpeg-devel] [PATCH 6/7] avcodec/hap: Avoid unnecessary opt.h inclusion

[Vittorio Giovara]

On Wed, Jan 24, 2024 at 9:06 PM Andreas Rheinhardt <
andreas.rheinhardt at outlook.com> wrote:

> It presumably exists because HapContext contains an AVClass*.
> Yet AVClass is actually defined in log.h and even this inclusion
> can be avoided by struct AVClass*. This avoids opt.h inclusions
> in hap.c and hapdec.c.
>
> Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt at outlook.com>
> ---
>  libavcodec/hap.h               | 5 ++---
>  libavcodec/hapqa_extract_bsf.c | 2 ++
>  2 files changed, 4 insertions(+), 3 deletions(-)
>
> diff --git a/libavcodec/hap.h b/libavcodec/hap.h
> index a888b58fd7..1de6d45428 100644
> --- a/libavcodec/hap.h
> +++ b/libavcodec/hap.h
> @@ -23,10 +23,9 @@
>  #ifndef AVCODEC_HAP_H
>  #define AVCODEC_HAP_H
>
> +#include <stddef.h>
>  #include <stdint.h>
>
> -#include "libavutil/opt.h"
> -
>  #include "bytestream.h"
>  #include "texturedsp.h"
>
> @@ -59,7 +58,7 @@ typedef struct HapChunk {
>  } HapChunk;
>
>  typedef struct HapContext {
> -    AVClass *class;
> +    const struct AVClass *class;
>
>      GetByteContext gbc;
>
> diff --git a/libavcodec/hapqa_extract_bsf.c
> b/libavcodec/hapqa_extract_bsf.c
> index 0d9b40aaa6..eac9eafe42 100644
> --- a/libavcodec/hapqa_extract_bsf.c
> +++ b/libavcodec/hapqa_extract_bsf.c
> @@ -30,6 +30,8 @@
>  #include "bytestream.h"
>  #include "hap.h"
>
> +#include "libavutil/opt.h"
>

Is this include only for AVClass? Should it be log.h then?
-- 
Vittorio