mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2024-11-30 13:41:48 +00:00
Code Issues 1 Projects Releases Wiki Activity

Remove duplicate declarations

Browse source 
This causes 'redefinition of typedef ...' errors on GCC 4.5.3
This commit is contained in:
Maciej Wolny 2018-11-19 18:20:52 +00:00
parent 193dbd20a8
commit ec655de288
2 changed files with 8 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
gst/flv/gstflvmux.h
View file

@ -38,6 +38,8 @@ G_BEGIN_DECLS
typedef struct _GstFlvMuxPad GstFlvMuxPad; typedef struct _GstFlvMuxPad GstFlvMuxPad;
typedef struct _GstFlvMuxPadClass GstFlvMuxPadClass; typedef struct _GstFlvMuxPadClass GstFlvMuxPadClass;
typedef struct _GstFlvMux GstFlvMux;
typedef struct _GstFlvMuxClass GstFlvMuxClass;
#define GST_TYPE_FLV_MUX \ #define GST_TYPE_FLV_MUX \
(gst_flv_mux_get_type ()) (gst_flv_mux_get_type ())
@ -70,9 +72,9 @@ struct _GstFlvMuxPad
gboolean info_changed; gboolean info_changed;
}; };
typedef struct _GstFlvMuxPadClass { struct _GstFlvMuxPadClass {
GstAggregatorPadClass parent; GstAggregatorPadClass parent;
} GstFlvMuxPadClass; };
typedef enum typedef enum
{ {
@ -80,7 +82,7 @@ typedef enum
GST_FLV_MUX_STATE_DATA GST_FLV_MUX_STATE_DATA
} GstFlvMuxState; } GstFlvMuxState;
typedef struct _GstFlvMux { struct _GstFlvMux {
GstAggregator aggregator; GstAggregator aggregator;
GstPad *srcpad; GstPad *srcpad;
@ -101,11 +103,11 @@ typedef struct _GstFlvMux {
GstClockTime last_dts; GstClockTime last_dts;
gboolean sent_header; gboolean sent_header;
} GstFlvMux; };
typedef struct _GstFlvMuxClass { struct _GstFlvMuxClass {
GstAggregatorClass parent; GstAggregatorClass parent;
} GstFlvMuxClass; };
GType gst_flv_mux_pad_get_type(void); GType gst_flv_mux_pad_get_type(void);
GType gst_flv_mux_get_type (void); GType gst_flv_mux_get_type (void);

1
sys/v4l2/gstv4l2allocator.h
View file

@ -50,7 +50,6 @@ typedef struct _GstV4l2MemoryGroup GstV4l2MemoryGroup;
typedef struct _GstV4l2Memory GstV4l2Memory; typedef struct _GstV4l2Memory GstV4l2Memory;
typedef enum _GstV4l2Capabilities GstV4l2Capabilities; typedef enum _GstV4l2Capabilities GstV4l2Capabilities;
typedef enum _GstV4l2Return GstV4l2Return; typedef enum _GstV4l2Return GstV4l2Return;
typedef struct _GstV4l2Object GstV4l2Object;
enum _GstV4l2AllocatorFlags enum _GstV4l2AllocatorFlags
{ {