diff mbox series

[FFmpeg-devel] avfilter/lavfutils.h: Don't include avformat.h

Message ID 20210225163539.1373683-1-andreas.rheinhardt@gmail.com
State Accepted
Commit 2869d7149394acfb3b544d76e5ef828db7a8dcff
Headers show
Series [FFmpeg-devel] avfilter/lavfutils.h: Don't include avformat.h
Related show

Checks

Context Check Description
andriy/x86_make success Make finished
andriy/x86_make_fate success Make fate finished
andriy/PPC64_make success Make finished
andriy/PPC64_make_fate success Make fate finished

Commit Message

Andreas Rheinhardt Feb. 25, 2021, 4:35 p.m. UTC
Only lavfutils.c needs avformat.h, not lavfutils.h.

Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@gmail.com>
---
 libavfilter/lavfutils.c | 1 +
 libavfilter/lavfutils.h | 3 ++-
 2 files changed, 3 insertions(+), 1 deletion(-)

Comments

James Almer Feb. 25, 2021, 6:53 p.m. UTC | #1
On 2/25/2021 1:35 PM, Andreas Rheinhardt wrote:
> Only lavfutils.c needs avformat.h, not lavfutils.h.
> 
> Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@gmail.com>
> ---
>   libavfilter/lavfutils.c | 1 +
>   libavfilter/lavfutils.h | 3 ++-
>   2 files changed, 3 insertions(+), 1 deletion(-)
> 
> diff --git a/libavfilter/lavfutils.c b/libavfilter/lavfutils.c
> index f8f8415c80..34051ee61d 100644
> --- a/libavfilter/lavfutils.c
> +++ b/libavfilter/lavfutils.c
> @@ -19,6 +19,7 @@
>    */
>   
>   #include "libavutil/imgutils.h"
> +#include "libavformat/avformat.h"
>   #include "lavfutils.h"
>   
>   int ff_load_image(uint8_t *data[4], int linesize[4],
> diff --git a/libavfilter/lavfutils.h b/libavfilter/lavfutils.h
> index 2d5308f79c..96738cead1 100644
> --- a/libavfilter/lavfutils.h
> +++ b/libavfilter/lavfutils.h
> @@ -24,7 +24,8 @@
>   #ifndef AVFILTER_LAVFUTILS_H
>   #define AVFILTER_LAVFUTILS_H
>   
> -#include "libavformat/avformat.h"
> +#include <stdint.h>
> +#include "libavutil/pixfmt.h"

Ok if make checkheaders passes.

>   
>   /**
>    * Load image from filename and put the resulting image in data.
>
diff mbox series

Patch

diff --git a/libavfilter/lavfutils.c b/libavfilter/lavfutils.c
index f8f8415c80..34051ee61d 100644
--- a/libavfilter/lavfutils.c
+++ b/libavfilter/lavfutils.c
@@ -19,6 +19,7 @@ 
  */
 
 #include "libavutil/imgutils.h"
+#include "libavformat/avformat.h"
 #include "lavfutils.h"
 
 int ff_load_image(uint8_t *data[4], int linesize[4],
diff --git a/libavfilter/lavfutils.h b/libavfilter/lavfutils.h
index 2d5308f79c..96738cead1 100644
--- a/libavfilter/lavfutils.h
+++ b/libavfilter/lavfutils.h
@@ -24,7 +24,8 @@ 
 #ifndef AVFILTER_LAVFUTILS_H
 #define AVFILTER_LAVFUTILS_H
 
-#include "libavformat/avformat.h"
+#include <stdint.h>
+#include "libavutil/pixfmt.h"
 
 /**
  * Load image from filename and put the resulting image in data.