av: Move gst_ffmpegdata functions to gstavprotocol.h too

Just for consistency.

6 files changed, 10 insertions, 9 deletions

diff --git a/ext/libav/Makefile.am b/ext/libav/Makefile.am
index 52f197ef2b..c721a4f73c 100644
--- a/ext/libav/Makefile.am
+++ b/ext/libav/Makefile.am
@@ -45,4 +45,4 @@ noinst_HEADERS = \
 	gstavaudenc.h \
 	gstavvidenc.h \
 	gstavcfg.h \
-	gstavpipe.h
+	gstavprotocol.h
diff --git a/ext/libav/gstav.h b/ext/libav/gstav.h
index 613914d7d0..1d4c8b3c85 100644
--- a/ext/libav/gstav.h
+++ b/ext/libav/gstav.h
@@ -57,9 +57,6 @@ int gst_ffmpeg_avcodec_open (AVCodecContext *avctx, AVCodec *codec);
 int gst_ffmpeg_avcodec_close (AVCodecContext *avctx);
 int gst_ffmpeg_av_find_stream_info(AVFormatContext *ic);
 
-int gst_ffmpegdata_open (GstPad * pad, int flags, AVIOContext ** context);
-int gst_ffmpegdata_close (AVIOContext * h);
-
 G_END_DECLS
 
 /* use GST_FFMPEG URL_STREAMHEADER with URL_WRONLY if the first
diff --git a/ext/libav/gstavdemux.c b/ext/libav/gstavdemux.c
index 49bc2e1396..9340ca997c 100644
--- a/ext/libav/gstavdemux.c
+++ b/ext/libav/gstavdemux.c
@@ -32,7 +32,7 @@
 #include "gstav.h"
 #include "gstavcodecmap.h"
 #include "gstavutils.h"
-#include "gstavpipe.h"
+#include "gstavprotocol.h"
 
 #define MAX_STREAMS 20
 
diff --git a/ext/libav/gstavmux.c b/ext/libav/gstavmux.c
index 0d5beeddaf..b302270ba5 100644
--- a/ext/libav/gstavmux.c
+++ b/ext/libav/gstavmux.c
@@ -31,6 +31,7 @@
 #include "gstav.h"
 #include "gstavcodecmap.h"
 #include "gstavutils.h"
+#include "gstavprotocol.h"
 
 typedef struct _GstFFMpegMux GstFFMpegMux;
 typedef struct _GstFFMpegMuxPad GstFFMpegMuxPad;
diff --git a/ext/libav/gstavprotocol.c b/ext/libav/gstavprotocol.c
index ef4f8cab09..5d01eaafb1 100644
--- a/ext/libav/gstavprotocol.c
+++ b/ext/libav/gstavprotocol.c
@@ -29,7 +29,7 @@
 #include <gst/gst.h>
 
 #include "gstav.h"
-#include "gstavpipe.h"
+#include "gstavprotocol.h"
 
 typedef struct _GstProtocolInfo GstProtocolInfo;
 
diff --git a/ext/libav/gstavpipe.h b/ext/libav/gstavprotocol.h
index d193db34c8..f4b2ba8ca4 100644
--- a/ext/libav/gstavpipe.h
+++ b/ext/libav/gstavprotocol.h
@@ -18,8 +18,8 @@
  */
 
 
-#ifndef __GST_FFMPEGPIPE_H__
-#define __GST_FFMPEGPIPE_H__
+#ifndef __GST_FFMPEGPROTOCOL_H__
+#define __GST_FFMPEGPROTOCOL_H__
 
 #include <gst/base/gstadapter.h>
 #include "gstav.h"
@@ -70,6 +70,9 @@ struct _GstFFMpegPipe
 int gst_ffmpeg_pipe_open (GstFFMpegPipe *ffpipe, int flags, AVIOContext ** context);
 int gst_ffmpeg_pipe_close (AVIOContext * h);
 
+int gst_ffmpegdata_open (GstPad * pad, int flags, AVIOContext ** context);
+int gst_ffmpegdata_close (AVIOContext * h);
+
 G_END_DECLS
 
-#endif /* __GST_FFMPEGPIPE_H__ */
+#endif /* __GST_FFMPEGPROTOCOL_H__ */