mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2024-11-26 19:51:11 +00:00
Code Issues 1 Projects Releases Wiki Activity

av: Move gst_ffmpegdata functions to gstavprotocol.h too

Browse source 
Just for consistency.
This commit is contained in:
Sebastian Dröge 2012-12-22 10:49:52 +01:00
parent bdd7406bc4
commit 08ca549627
6 changed files with 10 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
ext/libav/Makefile.am
View file

@ -45,4 +45,4 @@ noinst_HEADERS = \
gstavaudenc.h \ gstavaudenc.h \
gstavvidenc.h \ gstavvidenc.h \
gstavcfg.h \ gstavcfg.h \
gstavpipe.h gstavprotocol.h

3
ext/libav/gstav.h
View file

@ -57,9 +57,6 @@ int gst_ffmpeg_avcodec_open (AVCodecContext *avctx, AVCodec *codec);
int gst_ffmpeg_avcodec_close (AVCodecContext *avctx); int gst_ffmpeg_avcodec_close (AVCodecContext *avctx);
int gst_ffmpeg_av_find_stream_info(AVFormatContext *ic); 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 G_END_DECLS
/* use GST_FFMPEG URL_STREAMHEADER with URL_WRONLY if the first /* use GST_FFMPEG URL_STREAMHEADER with URL_WRONLY if the first

2
ext/libav/gstavdemux.c
View file

@ -32,7 +32,7 @@
#include "gstav.h" #include "gstav.h"
#include "gstavcodecmap.h" #include "gstavcodecmap.h"
#include "gstavutils.h" #include "gstavutils.h"
#include "gstavpipe.h" #include "gstavprotocol.h"
#define MAX_STREAMS 20 #define MAX_STREAMS 20

1
ext/libav/gstavmux.c
View file

@ -31,6 +31,7 @@
#include "gstav.h" #include "gstav.h"
#include "gstavcodecmap.h" #include "gstavcodecmap.h"
#include "gstavutils.h" #include "gstavutils.h"
#include "gstavprotocol.h"
typedef struct _GstFFMpegMux GstFFMpegMux; typedef struct _GstFFMpegMux GstFFMpegMux;
typedef struct _GstFFMpegMuxPad GstFFMpegMuxPad; typedef struct _GstFFMpegMuxPad GstFFMpegMuxPad;

2
ext/libav/gstavprotocol.c
View file

@ -29,7 +29,7 @@
#include <gst/gst.h> #include <gst/gst.h>
#include "gstav.h" #include "gstav.h"
#include "gstavpipe.h" #include "gstavprotocol.h"
typedef struct _GstProtocolInfo GstProtocolInfo; typedef struct _GstProtocolInfo GstProtocolInfo;

9
ext/libav/gstavpipe.h → ext/libav/gstavprotocol.h
View file

@ -18,8 +18,8 @@
*/ */
#ifndef __GST_FFMPEGPIPE_H__ #ifndef __GST_FFMPEGPROTOCOL_H__
#define __GST_FFMPEGPIPE_H__ #define __GST_FFMPEGPROTOCOL_H__
#include <gst/base/gstadapter.h> #include <gst/base/gstadapter.h>
#include "gstav.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_open (GstFFMpegPipe *ffpipe, int flags, AVIOContext ** context);
int gst_ffmpeg_pipe_close (AVIOContext * h); 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 G_END_DECLS
#endif /* __GST_FFMPEGPIPE_H__ */ #endif /* __GST_FFMPEGPROTOCOL_H__ */