gstlibav: minor fixes for header files

Move G_BEGIN_DECLS below includes and add missing include

Part-of: <https://gitlab.freedesktop.org/gstreamer/gst-libav/-/merge_requests/71>

diff --git a/ext/libav/gstavaudenc.h b/ext/libav/gstavaudenc.h
index 4140856..23640bb 100644 (file)
--- a/ext/libav/gstavaudenc.h
+++ b/ext/libav/gstavaudenc.h
@@ -24,12 +24,12 @@
 #ifndef __GST_FFMPEGAUDENC_H__
 #define __GST_FFMPEGAUDENC_H__
 
-G_BEGIN_DECLS
-
 #include <gst/gst.h>
 #include <gst/audio/gstaudioencoder.h>
 #include <libavcodec/avcodec.h>
 
+G_BEGIN_DECLS
+
 typedef struct _GstFFMpegAudEnc GstFFMpegAudEnc;
 
 struct _GstFFMpegAudEnc

diff --git a/ext/libav/gstavcodecmap.h b/ext/libav/gstavcodecmap.h
index 56975b6..6681a62 100644 (file)
--- a/ext/libav/gstavcodecmap.h
+++ b/ext/libav/gstavcodecmap.h
@@ -21,6 +21,7 @@
 #define __GST_FFMPEG_CODECMAP_H__
 
 #include <libavcodec/avcodec.h>
+#include <libavformat/avformat.h>
 #include <gst/gst.h>
 #include <gst/audio/audio.h>
 #include <gst/video/video.h>

diff --git a/ext/libav/gstavviddec.h b/ext/libav/gstavviddec.h
index a4ee1a0..a9f9da1 100644 (file)
--- a/ext/libav/gstavviddec.h
+++ b/ext/libav/gstavviddec.h
@@ -19,12 +19,12 @@
 #ifndef __GST_FFMPEGVIDDEC_H__
 #define __GST_FFMPEGVIDDEC_H__
 
-G_BEGIN_DECLS
-
 #include <gst/gst.h>
 #include <gst/video/video.h>
 #include <libavcodec/avcodec.h>
 
+G_BEGIN_DECLS
+
 typedef struct _GstFFMpegVidDec GstFFMpegVidDec;
 struct _GstFFMpegVidDec
 {