ios: do not use std=c11

ijkmedia/ijkplayer/ff_ffpipeline.h

@@ -27,10 +27,11 @@
 #include "ijksdl/ijksdl_mutex.h"
 #include "ijksdl/ijksdl_aout.h"
 #include "ff_ffpipenode.h"
+#include "ff_ffplay_def.h"
 
 typedef struct IJKFF_Pipeline_Opaque IJKFF_Pipeline_Opaque;
 typedef struct IJKFF_Pipeline IJKFF_Pipeline;
-typedef struct IJKFF_Pipeline {
+struct IJKFF_Pipeline {
     SDL_Class             *opaque_class;
     IJKFF_Pipeline_Opaque *opaque;
 
@@ -38,7 +39,7 @@ typedef struct IJKFF_Pipeline {
     IJKFF_Pipenode *(*func_open_video_decoder)  (IJKFF_Pipeline *pipeline, FFPlayer *ffp);
     IJKFF_Pipenode *(*func_open_video_output)   (IJKFF_Pipeline *pipeline, FFPlayer *ffp);
     SDL_Aout       *(*func_open_audio_output)   (IJKFF_Pipeline *pipeline, FFPlayer *ffp);
-} IJKFF_Pipeline;
+};
 
 IJKFF_Pipeline *ffpipeline_alloc(SDL_Class *opaque_class, size_t opaque_size);
 void ffpipeline_free(IJKFF_Pipeline *pipeline);

ijkmedia/ijkplayer/ff_ffpipenode.h

@@ -25,18 +25,16 @@
 
 #include "ijksdl/ijksdl_mutex.h"
 
-typedef struct FFPlayer FFPlayer;
-
 typedef struct IJKFF_Pipenode_Opaque IJKFF_Pipenode_Opaque;
 typedef struct IJKFF_Pipenode IJKFF_Pipenode;
-typedef struct IJKFF_Pipenode {
+struct IJKFF_Pipenode {
     SDL_mutex *mutex;
     void *opaque;
 
     void (*func_destroy) (IJKFF_Pipenode *node);
     int  (*func_run_sync)(IJKFF_Pipenode *node);
     int  (*func_flush)   (IJKFF_Pipenode *node); // optional
-} IJKFF_Pipenode;
+};
 
 IJKFF_Pipenode *ffpipenode_alloc(size_t opaque_size);
 void ffpipenode_free(IJKFF_Pipenode *node);

ijkmedia/ijkplayer/ff_ffplay.h

@@ -94,6 +94,6 @@ void      ffp_set_video_codec_info(FFPlayer *ffp, const char *module, const char
 void      ffp_set_audio_codec_info(FFPlayer *ffp, const char *module, const char *codec);
 
 // must be freed with free();
-IjkMediaMeta *ffp_get_meta_l(FFPlayer *ffp);
+struct IjkMediaMeta *ffp_get_meta_l(FFPlayer *ffp);
 
 #endif

ijkmedia/ijkplayer/ff_ffplay_def.h

@@ -426,8 +426,8 @@ static SDL_Surface *screen;
  ****************************************************************************/
 
 /* ffplayer */
-typedef struct IjkMediaMeta IjkMediaMeta;
-typedef struct IJKFF_Pipeline IJKFF_Pipeline;
+struct IjkMediaMeta;
+struct IJKFF_Pipeline;
 typedef struct FFPlayer {
     const AVClass *av_class;
 
@@ -510,8 +510,8 @@ typedef struct FFPlayer {
     /* extra fields */
     SDL_Aout *aout;
     SDL_Vout *vout;
-    IJKFF_Pipeline *pipeline;
-    IJKFF_Pipenode *node_vdec;
+    struct IJKFF_Pipeline *pipeline;
+    struct IJKFF_Pipenode *node_vdec;
     int sar_num;
     int sar_den;
 
@@ -549,7 +549,7 @@ typedef struct FFPlayer {
     int mediacodec;
     int opensles;
 
-    IjkMediaMeta *meta;
+    struct IjkMediaMeta *meta;
 
     ijk_format_control_message format_control_message;
     void *format_control_opaque;

ijkmedia/ijkplayer/ijkmeta.c

@@ -26,7 +26,7 @@
 
 #define IJK_META_INIT_CAPACITY 13
 
-typedef struct IjkMediaMeta {
+struct IjkMediaMeta {
     SDL_mutex *mutex;
 
     AVDictionary *dict;
@@ -34,7 +34,7 @@ typedef struct IjkMediaMeta {
     size_t children_count;
     size_t children_capacity;
     IjkMediaMeta **children;
-} IjkMediaMeta;
+};
 
 IjkMediaMeta *ijkmeta_create()
 {

ijkmedia/ijkplayer/ijkmeta.h

@@ -60,9 +60,8 @@
 // reserved for user
 #define IJKM_KEY_STREAMS        "streams"
 
-
+struct AVFormatContext;
 typedef struct IjkMediaMeta IjkMediaMeta;
-typedef struct AVFormatContext AVFormatContext;
 
 IjkMediaMeta *ijkmeta_create();
 void ijkmeta_destroy(IjkMediaMeta *meta);
@@ -74,7 +73,7 @@ void ijkmeta_unlock(IjkMediaMeta *meta);
 void ijkmeta_append_child_l(IjkMediaMeta *meta, IjkMediaMeta *child);
 void ijkmeta_set_int64_l(IjkMediaMeta *meta, const char *name, int64_t value);
 void ijkmeta_set_string_l(IjkMediaMeta *meta, const char *name, const char *value);
-void ijkmeta_set_avformat_context_l(IjkMediaMeta *meta, AVFormatContext *ic);
+void ijkmeta_set_avformat_context_l(IjkMediaMeta *meta, struct AVFormatContext *ic);
 
 // must be freed with free();
 const char   *ijkmeta_get_string_l(IjkMediaMeta *meta, const char *name);

ijkmedia/ijkplayer/ijkplayer.h

@@ -33,8 +33,8 @@
 #endif
 
 typedef struct IjkMediaPlayer IjkMediaPlayer;
-typedef struct FFPlayer FFPlayer;
-typedef struct SDL_Vout SDL_Vout;
+struct FFPlayer;
+struct SDL_Vout;
 
 /*-
  MPST_CHECK_NOT_RET(mp->mp_state, MP_STATE_IDLE);

ijkmedia/ijkplayer/ijkplayer_internal.h

@@ -29,7 +29,7 @@
 #include "ff_ffplay.h"
 #include "ijkplayer.h"
 
-typedef struct IjkMediaPlayer {
+struct IjkMediaPlayer {
     volatile int ref_count;
     pthread_mutex_t mutex;
     FFPlayer *ffplayer;
@@ -45,6 +45,6 @@ typedef struct IjkMediaPlayer {
     int restart_from_beginning;
     int seek_req;
     long seek_msec;
-} IjkMediaPlayer;
+};
 
 #endif

ijkmedia/ijkplayer/pipeline/ffpipeline_ffplay.c

@@ -29,9 +29,9 @@ static SDL_Class g_pipeline_class = {
     .name = "ffpipeline_ffplay",
 };
 
- typedef struct IJKFF_Pipeline_Opaque {
+struct IJKFF_Pipeline_Opaque {
     FFPlayer *ffp;
-} IJKFF_Pipeline_Opaque;
+};
 
 static void func_destroy(IJKFF_Pipeline *pipeline)
 {

ijkmedia/ijkplayer/pipeline/ffpipeline_ffplay.h

@@ -25,9 +25,6 @@
 
 #include "../ff_ffpipeline.h"
 
-typedef struct FFPlayer       FFPlayer;
-typedef struct IJKFF_Pipeline IJKFF_Pipeline;
-
 // There is no default aout for ffplay.
 // IJKFF_Pipeline *ffpipeline_create_from_ffplay(FFPlayer *ffp);
 

ijkmedia/ijkplayer/pipeline/ffpipenode_ffplay_vdec.c

@@ -24,9 +24,9 @@
 #include "../ff_ffpipenode.h"
 #include "../ff_ffplay.h"
 
-typedef struct IJKFF_Pipenode_Opaque {
+struct IJKFF_Pipenode_Opaque {
     FFPlayer *ffp;
-} IJKFF_Pipenode_Opaque;
+};
 
 static void func_destroy(IJKFF_Pipenode *node)
 {

ijkmedia/ijkplayer/pipeline/ffpipenode_ffplay_vdec.h

@@ -25,8 +25,8 @@
 
 #include "../ff_ffpipenode.h"
 
-typedef struct FFPlayer FFPlayer;
+struct FFPlayer;
 
-IJKFF_Pipenode *ffpipenode_create_video_decoder_from_ffplay(FFPlayer *ffp);
+IJKFF_Pipenode *ffpipenode_create_video_decoder_from_ffplay(struct FFPlayer *ffp);
 
 #endif

ijkmedia/ijkplayer/pipeline/ffpipenode_ffplay_vout.c

@@ -24,9 +24,9 @@
 #include "../ff_ffpipenode.h"
 #include "../ff_ffplay.h"
 
-typedef struct IJKFF_Pipenode_Opaque {
+struct IJKFF_Pipenode_Opaque {
     FFPlayer *ffp;
-} IJKFF_Pipenode_Opaque;
+};
 
 static void func_destroy(IJKFF_Pipenode *node)
 {

ijkmedia/ijkplayer/pipeline/ffpipenode_ffplay_vout.h

@@ -25,8 +25,8 @@
 
 #include "../ff_ffpipenode.h"
 
-typedef struct FFPlayer FFPlayer;
+struct FFPlayer;
 
-IJKFF_Pipenode *ffpipenode_create_video_output_from_ffplay(FFPlayer *ffp);
+IJKFF_Pipenode *ffpipenode_create_video_output_from_ffplay(struct FFPlayer *ffp);
 
 #endif

ijkmedia/ijksdl/dummy/ijksdl_vout_dummy.c

@@ -30,9 +30,9 @@ typedef struct SDL_VoutSurface_Opaque {
     SDL_Vout *vout;
 } SDL_VoutSurface_Opaque;
 
-typedef struct SDL_Vout_Opaque {
+struct SDL_Vout_Opaque {
     char dummy;
-} SDL_Vout_Opaque;
+};
 
 static void vout_free_l(SDL_Vout *vout)
 {

ijkmedia/ijksdl/ffmpeg/ijksdl_vout_overlay_ffmpeg.c

@@ -33,7 +33,7 @@
 #include "ijksdl_inc_ffmpeg.h"
 #include "ijksdl_image_convert.h"
 
-typedef struct SDL_VoutOverlay_Opaque {
+struct SDL_VoutOverlay_Opaque {
     SDL_mutex *mutex;
 
     AVFrame *managed_frame;
@@ -46,7 +46,7 @@ typedef struct SDL_VoutOverlay_Opaque {
     Uint8 *pixels[AV_NUM_DATA_POINTERS];
 
     int no_neon_warned;
-} SDL_VoutOverlay_Opaque;
+};
 
 /* Always assume a linesize alignment of 1 here */
 // TODO: 9 alignment to speed up memcpy when display

ijkmedia/ijksdl/ijksdl_aout.h

@@ -30,7 +30,7 @@
 
 typedef struct SDL_Aout_Opaque SDL_Aout_Opaque;
 typedef struct SDL_Aout SDL_Aout;
-typedef struct SDL_Aout {
+struct SDL_Aout {
     SDL_mutex *mutex;
     double     minimal_latency_seconds;
 
@@ -45,7 +45,7 @@ typedef struct SDL_Aout {
 
     double (*func_get_latency_seconds)(SDL_Aout *aout);
     void   (*func_set_default_latency_seconds)(SDL_Aout *aout, double latency);
-} SDL_Aout;
+};
 
 int SDL_AoutOpenAudio(SDL_Aout *aout, const SDL_AudioSpec *desired, SDL_AudioSpec *obtained);
 void SDL_AoutPauseAudio(SDL_Aout *aout, int pause_on);

ijkmedia/ijksdl/ijksdl_vout.h

@@ -31,7 +31,7 @@
 
 typedef struct SDL_VoutOverlay_Opaque SDL_VoutOverlay_Opaque;
 typedef struct SDL_VoutOverlay SDL_VoutOverlay;
-typedef struct SDL_VoutOverlay {
+struct SDL_VoutOverlay {
     int w; /**< Read-only */
     int h; /**< Read-only */
     Uint32 format; /**< Read-only */
@@ -47,11 +47,11 @@ typedef struct SDL_VoutOverlay {
     int                     (*lock)(SDL_VoutOverlay *overlay);
     int                     (*unlock)(SDL_VoutOverlay *overlay);
     void                    (*unref)(SDL_VoutOverlay *overlay);
-} SDL_VoutOverlay;
+};
 
 typedef struct SDL_Vout_Opaque SDL_Vout_Opaque;
 typedef struct SDL_Vout SDL_Vout;
-typedef struct SDL_Vout {
+struct SDL_Vout {
     SDL_mutex *mutex;
 
     SDL_Class       *opaque_class;
@@ -59,7 +59,7 @@ typedef struct SDL_Vout {
     SDL_VoutOverlay *(*create_overlay)(int width, int height, Uint32 format, SDL_Vout *vout);
     void (*free_l)(SDL_Vout *vout);
     int (*display_overlay)(SDL_Vout *vout, SDL_VoutOverlay *overlay);
-} SDL_Vout;
+};
 
 void SDL_VoutFree(SDL_Vout *vout);
 void SDL_VoutFreeP(SDL_Vout **pvout);

ios/IJKMediaPlayer/IJKMediaPlayer.xcodeproj/project.pbxproj

@@ -718,7 +718,6 @@
 			isa = XCBuildConfiguration;
 			buildSettings = {
 				DSTROOT = /tmp/IJKMediaPlayer.dst;
-				GCC_C_LANGUAGE_STANDARD = c11;
 				GCC_PRECOMPILE_PREFIX_HEADER = YES;
 				GCC_PREFIX_HEADER = "IJKMediaPlayer/IJKMediaPlayer-Prefix.pch";
 				HEADER_SEARCH_PATHS = (
@@ -740,7 +739,6 @@
 			isa = XCBuildConfiguration;
 			buildSettings = {
 				DSTROOT = /tmp/IJKMediaPlayer.dst;
-				GCC_C_LANGUAGE_STANDARD = c11;
 				GCC_PRECOMPILE_PREFIX_HEADER = YES;
 				GCC_PREFIX_HEADER = "IJKMediaPlayer/IJKMediaPlayer-Prefix.pch";
 				HEADER_SEARCH_PATHS = (

ios/IJKMediaPlayer/IJKMediaPlayer/IJKFFOptions.h

@@ -41,13 +41,13 @@ typedef enum IJKAVDiscard {
     IJK_AVDISCARD_ALL     = 48, ///< discard all
 } IJKAVDiscard;
 
-typedef struct IjkMediaPlayer IjkMediaPlayer;
+struct IjkMediaPlayer;
 
 @interface IJKFFOptions : NSObject
 
 +(IJKFFOptions *)optionsByDefault;
 
--(void)applyTo:(IjkMediaPlayer *)mediaPlayer;
+-(void)applyTo:(struct IjkMediaPlayer *)mediaPlayer;
 
 - (void)setOptionValue:(NSString *)value
                 forKey:(NSString *)key

ios/IJKMediaPlayer/IJKMediaPlayer/ijkmedia/ijkplayer/ios/pipeline/ffpipeline_ios.c

@@ -27,10 +27,10 @@
 #include "ff_ffplay.h"
 #import "ijksdl/ios/ijksdl_aout_ios_audiounit.h"
 
-typedef struct IJKFF_Pipeline_Opaque {
+struct IJKFF_Pipeline_Opaque {
     FFPlayer    *ffp;
     bool         is_videotoolbox_open;
-} IJKFF_Pipeline_Opaque;
+};
 
 static void func_destroy(IJKFF_Pipeline *pipeline)
 {

ios/IJKMediaPlayer/IJKMediaPlayer/ijkmedia/ijkplayer/ios/pipeline/ffpipeline_ios.h

@@ -25,9 +25,8 @@
 
 #include "ijkplayer/ff_ffpipeline.h"
 
-typedef struct FFPlayer       FFPlayer;
-typedef struct IJKFF_Pipeline IJKFF_Pipeline;
+struct FFPlayer;
 
-IJKFF_Pipeline *ffpipeline_create_from_ios(FFPlayer *ffp);
+IJKFF_Pipeline *ffpipeline_create_from_ios(struct FFPlayer *ffp);
 
 #endif

ios/IJKMediaPlayer/IJKMediaPlayer/ijkmedia/ijkplayer/ios/pipeline/ffpipenode_ios_videotoolbox_vdec.h

@@ -25,8 +25,8 @@
 
 #include "ijkplayer/ff_ffpipenode.h"
 
-typedef struct FFPlayer FFPlayer;
+struct FFPlayer;
 
-IJKFF_Pipenode *ffpipenode_create_video_decoder_from_ios_videotoolbox(FFPlayer *ffp);
+IJKFF_Pipenode *ffpipenode_create_video_decoder_from_ios_videotoolbox(struct FFPlayer *ffp);
 
 #endif

ios/IJKMediaPlayer/IJKMediaPlayer/ijkmedia/ijkplayer/ios/pipeline/ffpipenode_ios_videotoolbox_vdec.m

@@ -29,7 +29,7 @@
 #include "ijksdl_mutex.h"
 #include "ijksdl_vout_ios_gles2.h"
 
-typedef struct IJKFF_Pipenode_Opaque {
+struct IJKFF_Pipenode_Opaque {
     IJKFF_Pipeline           *pipeline;
     FFPlayer                 *ffp;
     Decoder                  *decoder;
@@ -37,7 +37,7 @@ typedef struct IJKFF_Pipenode_Opaque {
     AVCodecContext           *avctx; // not own
     SDL_Thread*              video_fill_thread;
     SDL_Thread              _video_fill_thread;
-} IJKFF_Pipenode_Opaque;
+};
 
 
 

ios/IJKMediaPlayer/IJKMediaPlayer/ijkmedia/ijkplayer/ios/pipeline/ffpipenode_ios_videotoolbox_vout.h

@@ -25,8 +25,8 @@
 
 #include "ijkplayer/ff_ffpipenode.h"
 
-typedef struct FFPlayer FFPlayer;
+struct FFPlayer;
 
-IJKFF_Pipenode *ffpipenode_create_video_output_from_ios_videotoolbox(FFPlayer *ffp);
+IJKFF_Pipenode *ffpipenode_create_video_output_from_ios_videotoolbox(struct FFPlayer *ffp);
 
 #endif

ios/IJKMediaPlayer/IJKMediaPlayer/ijkmedia/ijkplayer/ios/pipeline/ffpipenode_ios_videotoolbox_vout.m

@@ -26,9 +26,9 @@
 #include "ijkplayer/ff_ffpipenode.h"
 #include "ijkplayer/ff_ffplay.h"
 
-typedef struct IJKFF_Pipenode_Opaque {
+struct IJKFF_Pipenode_Opaque {
     FFPlayer *ffp;
-} IJKFF_Pipenode_Opaque;
+};
 
 static void func_destroy(IJKFF_Pipenode *node)
 {

ios/IJKMediaPlayer/IJKMediaPlayer/ijkmedia/ijksdl/ios/ijksdl_aout_ios_audiounit.m

@@ -30,9 +30,9 @@
 #import "IJKSDLAudioUnitController.h"
 #import "IJKSDLAudioQueueController.h"
 
-typedef struct SDL_Aout_Opaque {
+struct SDL_Aout_Opaque {
     IJKSDLAudioQueueController *aoutController;
-} SDL_Aout_Opaque;
+};
 
 static int aout_open_audio(SDL_Aout *aout, const SDL_AudioSpec *desired, SDL_AudioSpec *obtained)
 {

ios/IJKMediaPlayer/IJKMediaPlayer/ijkmedia/ijksdl/ios/ijksdl_vout_ios_gles2.m

@@ -34,9 +34,9 @@ typedef struct SDL_VoutSurface_Opaque {
     SDL_Vout *vout;
 } SDL_VoutSurface_Opaque;
 
-typedef struct SDL_Vout_Opaque {
+struct SDL_Vout_Opaque {
     IJKSDLGLView *gl_view;
-} SDL_Vout_Opaque;
+};
 
 static SDL_VoutOverlay *vout_create_overlay_l(int width, int height, Uint32 format, SDL_Vout *vout)
 {

ios/IJKMediaPlayer/IJKMediaPlayer/ijkmedia/ijksdl/ios/ijksdl_vout_overlay_videotoolbox.m

@@ -31,12 +31,12 @@
 #include "IJKVideoToolBox.h"
 
 
-typedef struct SDL_VoutOverlay_Opaque {
+struct SDL_VoutOverlay_Opaque {
     SDL_mutex *mutex;
     CVPixelBufferRef pixel_buffer;
     Uint16 pitches[AV_NUM_DATA_POINTERS];
     Uint8 *pixels[AV_NUM_DATA_POINTERS];
-} SDL_VoutOverlay_Opaque;
+};
 
 
 static void overlay_free_l(SDL_VoutOverlay *overlay)