From bdd7406bc4f7b59d669d207b764e2ef243f23abf Mon Sep 17 00:00:00 2001 From: Thijs Vermeir Date: Fri, 21 Dec 2012 23:16:44 +0100 Subject: [PATCH] av: Fix redefinition of typedef 'GstFFMpegPipe' Move declaration of pipe function to correct headers file --- ext/libav/gstav.h | 3 --- ext/libav/gstavpipe.h | 3 +++ 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/ext/libav/gstav.h b/ext/libav/gstav.h index b18c15c..613914d 100644 --- a/ext/libav/gstav.h +++ b/ext/libav/gstav.h @@ -59,9 +59,6 @@ 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); -typedef struct _GstFFMpegPipe GstFFMpegPipe; -int gst_ffmpeg_pipe_open (GstFFMpegPipe *ffpipe, int flags, AVIOContext ** context); -int gst_ffmpeg_pipe_close (AVIOContext * h); G_END_DECLS diff --git a/ext/libav/gstavpipe.h b/ext/libav/gstavpipe.h index 48f6575..d193db3 100644 --- a/ext/libav/gstavpipe.h +++ b/ext/libav/gstavpipe.h @@ -67,6 +67,9 @@ struct _GstFFMpegPipe guint needed; }; +int gst_ffmpeg_pipe_open (GstFFMpegPipe *ffpipe, int flags, AVIOContext ** context); +int gst_ffmpeg_pipe_close (AVIOContext * h); + G_END_DECLS #endif /* __GST_FFMPEGPIPE_H__ */ -- 2.7.4