diff --git a/ijkmedia/ijkplayer/ff_ffplay.c b/ijkmedia/ijkplayer/ff_ffplay.c index 0198e914ae12d456e5cdafea380ba91395c8df77..b236b57d824033badfffd2989016d32add886a8c 100644 --- a/ijkmedia/ijkplayer/ff_ffplay.c +++ b/ijkmedia/ijkplayer/ff_ffplay.c @@ -1486,7 +1486,7 @@ static int audio_decode_frame(FFPlayer *ffp) if (is->swr_ctx) { const uint8_t **in = (const uint8_t **)is->frame->extended_data; uint8_t **out = &is->audio_buf1; - int out_count = (int64_t)wanted_nb_samples * is->audio_tgt.freq / is->frame->sample_rate + 256; + int out_count = (int)((int64_t)wanted_nb_samples * is->audio_tgt.freq / is->frame->sample_rate + 256); int out_size = av_samples_get_buffer_size(NULL, is->audio_tgt.channels, out_count, is->audio_tgt.fmt, 0); int len2; if (out_size < 0) { @@ -2270,15 +2270,15 @@ static int read_thread(void *arg) video_cached_duration = is->videoq.duration * av_q2d(is->video_st->time_base) * 1000; if (video_cached_duration >= 0 && audio_cached_duration >= 0) { - cached_duration_in_ms = IJKMAX(video_cached_duration, audio_cached_duration); + cached_duration_in_ms = (int)IJKMAX(video_cached_duration, audio_cached_duration); } else if (video_cached_duration >= 0) { - cached_duration_in_ms = video_cached_duration; + cached_duration_in_ms = (int)video_cached_duration; } else if (audio_cached_duration >= 0) { - cached_duration_in_ms = audio_cached_duration; + cached_duration_in_ms = (int)audio_cached_duration; } if (cached_duration_in_ms >= 0) { - buf_time_percent = av_rescale(cached_duration_in_ms, 1005, hwm_in_ms * 10); + buf_time_percent = (int)av_rescale(cached_duration_in_ms, 1005, hwm_in_ms * 10); if (last_buffered_time_percentage != buf_time_percent) { #ifdef FFP_SHOW_DEMUX_CACHE ALOGE("time cache=%%%d (%d/%d)\n", buf_time_percent, cached_duration_in_ms, hwm_in_ms); @@ -2291,7 +2291,7 @@ static int read_thread(void *arg) int cached_size = is->audioq.size + is->videoq.size; if (hwm_in_bytes > 0) { - buf_size_percent = av_rescale(cached_size, 1005, hwm_in_bytes * 10); + buf_size_percent = (int)av_rescale(cached_size, 1005, hwm_in_bytes * 10); if (last_buffered_size_percentage != buf_size_percent) { #ifdef FFP_SHOW_DEMUX_CACHE ALOGE("size cache=%%%d (%d/%d)\n", buf_size_percent, cached_size, hwm_in_bytes); @@ -2424,7 +2424,7 @@ static int video_refresh_thread(void *arg) double remaining_time = 0.0; while (!is->abort_request) { if (remaining_time > 0.0) - av_usleep((int64_t)(remaining_time * 1000000.0)); + av_usleep((int)(int64_t)(remaining_time * 1000000.0)); remaining_time = REFRESH_RATE; if (is->show_mode != SHOW_MODE_NONE && (!is->paused || is->force_refresh)) video_refresh(ffp, &remaining_time); diff --git a/ijkmedia/ijkplayer/ff_ffplay_def.h b/ijkmedia/ijkplayer/ff_ffplay_def.h index 3fa6ae1c4cc134db6e7f3c71e256c1f8d414b73e..bceb4b29521db1eee0a291c90e12e4ac19c4a591 100644 --- a/ijkmedia/ijkplayer/ff_ffplay_def.h +++ b/ijkmedia/ijkplayer/ff_ffplay_def.h @@ -405,7 +405,7 @@ typedef struct FFPlayer { char *afilters; #endif - int64_t sws_flags; + int sws_flags; /* current context */ #ifdef FFP_MERGE diff --git a/ijkmedia/ijkplayer/ijkplayer.c b/ijkmedia/ijkplayer/ijkplayer.c index 89d24afaa55743cd45bbdcfe9a49ec627ce7932b..35056c63b90da668ba4ea688e69ffc2b1bf8c1df 100644 --- a/ijkmedia/ijkplayer/ijkplayer.c +++ b/ijkmedia/ijkplayer/ijkplayer.c @@ -445,7 +445,7 @@ int ijkmp_seek_to_l(IjkMediaPlayer *mp, long msec) mp->seek_req = 1; mp->seek_msec = msec; ffp_remove_msg(mp->ffplayer, FFP_REQ_SEEK); - ffp_notify_msg2(mp->ffplayer, FFP_REQ_SEEK, msec); + ffp_notify_msg2(mp->ffplayer, FFP_REQ_SEEK, (int)msec); // TODO: 9 64-bit long? return 0; @@ -495,7 +495,7 @@ long ijkmp_get_duration(IjkMediaPlayer *mp) { assert(mp); pthread_mutex_lock(&mp->mutex); - int retval = ijkmp_get_duration_l(mp); + long retval = ijkmp_get_duration_l(mp); pthread_mutex_unlock(&mp->mutex); return retval; } @@ -583,8 +583,8 @@ int ijkmp_get_msg(IjkMediaPlayer *mp, AVMessage *msg, int block) continue_wait_next_msg = 1; pthread_mutex_lock(&mp->mutex); if (0 == ikjmp_chkst_pause_l(mp->mp_state)) { - int retval = ffp_pause_l(mp->ffplayer); - if (retval == 0) + int pause_ret = ffp_pause_l(mp->ffplayer); + if (pause_ret == 0) ijkmp_change_state_l(mp, MP_STATE_PAUSED); } pthread_mutex_unlock(&mp->mutex); diff --git a/ijkmedia/ijksdl/ffmpeg/ijksdl_vout_overlay_ffmpeg.c b/ijkmedia/ijksdl/ffmpeg/ijksdl_vout_overlay_ffmpeg.c index 9416c66d90bb6a6eca68017d6925beedaa2f4f1c..0f2e473b546c9274e65af3e921fc08a4d2f1a649 100644 --- a/ijkmedia/ijksdl/ffmpeg/ijksdl_vout_overlay_ffmpeg.c +++ b/ijkmedia/ijksdl/ffmpeg/ijksdl_vout_overlay_ffmpeg.c @@ -177,10 +177,6 @@ SDL_VoutOverlay *SDL_VoutFFmpeg_CreateOverlay(int width, int height, Uint32 form // 16 bytes align pitch for arm-neon image-convert buf_width = IJKALIGN(width, 16); // 1 bytes per pixel for Y-plane #elif defined(__APPLE__) - // 2^n align for width - buf_width = width; - if (width > 0) - buf_width = 1 << (sizeof(int) * 8 - __builtin_clz(width)); buf_width = width; #else buf_width = IJKALIGN(width, 16); // unknown platform diff --git a/ios/IJKMediaPlayer/IJKMediaPlayer.xcodeproj/project.pbxproj b/ios/IJKMediaPlayer/IJKMediaPlayer.xcodeproj/project.pbxproj index a091632b7b6074b4da6cda2a602528fb259be0a1..4f2b52e5587623a0716a578d9489996fac5d59d0 100644 --- a/ios/IJKMediaPlayer/IJKMediaPlayer.xcodeproj/project.pbxproj +++ b/ios/IJKMediaPlayer/IJKMediaPlayer.xcodeproj/project.pbxproj @@ -711,13 +711,18 @@ isa = XCBuildConfiguration; buildSettings = { ALWAYS_SEARCH_USER_PATHS = NO; + ARCHS = "$(ARCHS_STANDARD_INCLUDING_64_BIT)"; + CLANG_ANALYZER_SECURITY_FLOATLOOPCOUNTER = YES; CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x"; CLANG_CXX_LIBRARY = "libc++"; CLANG_ENABLE_OBJC_ARC = YES; + CLANG_WARN_BOOL_CONVERSION = YES; CLANG_WARN_CONSTANT_CONVERSION = YES; + CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = YES; CLANG_WARN_EMPTY_BODY = YES; CLANG_WARN_ENUM_CONVERSION = YES; CLANG_WARN_INT_CONVERSION = YES; + CLANG_WARN_OBJC_IMPLICIT_ATOMIC_PROPERTIES = YES; CLANG_WARN__DUPLICATE_METHOD_MATCH = YES; COPY_PHASE_STRIP = NO; GCC_C_LANGUAGE_STANDARD = gnu99; @@ -728,10 +733,13 @@ "$(inherited)", ); GCC_SYMBOLS_PRIVATE_EXTERN = NO; + GCC_WARN_ABOUT_MISSING_NEWLINE = YES; GCC_WARN_ABOUT_RETURN_TYPE = YES; + GCC_WARN_FOUR_CHARACTER_CONSTANTS = YES; + GCC_WARN_SHADOW = YES; GCC_WARN_UNINITIALIZED_AUTOS = YES; GCC_WARN_UNUSED_VARIABLE = YES; - IPHONEOS_DEPLOYMENT_TARGET = 5.0; + IPHONEOS_DEPLOYMENT_TARGET = 5.1.1; ONLY_ACTIVE_ARCH = YES; SDKROOT = iphoneos; }; @@ -741,20 +749,28 @@ isa = XCBuildConfiguration; buildSettings = { ALWAYS_SEARCH_USER_PATHS = NO; + ARCHS = "$(ARCHS_STANDARD_INCLUDING_64_BIT)"; + CLANG_ANALYZER_SECURITY_FLOATLOOPCOUNTER = YES; CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x"; CLANG_CXX_LIBRARY = "libc++"; CLANG_ENABLE_OBJC_ARC = YES; + CLANG_WARN_BOOL_CONVERSION = YES; CLANG_WARN_CONSTANT_CONVERSION = YES; + CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = YES; CLANG_WARN_EMPTY_BODY = YES; CLANG_WARN_ENUM_CONVERSION = YES; CLANG_WARN_INT_CONVERSION = YES; + CLANG_WARN_OBJC_IMPLICIT_ATOMIC_PROPERTIES = YES; CLANG_WARN__DUPLICATE_METHOD_MATCH = YES; COPY_PHASE_STRIP = YES; GCC_C_LANGUAGE_STANDARD = gnu99; + GCC_WARN_ABOUT_MISSING_NEWLINE = YES; GCC_WARN_ABOUT_RETURN_TYPE = YES; + GCC_WARN_FOUR_CHARACTER_CONSTANTS = YES; + GCC_WARN_SHADOW = YES; GCC_WARN_UNINITIALIZED_AUTOS = YES; GCC_WARN_UNUSED_VARIABLE = YES; - IPHONEOS_DEPLOYMENT_TARGET = 5.0; + IPHONEOS_DEPLOYMENT_TARGET = 5.1.1; SDKROOT = iphoneos; VALIDATE_PRODUCT = YES; }; diff --git a/ios/IJKMediaPlayer/IJKMediaPlayer/IJKFFMoviePlayerDef.m b/ios/IJKMediaPlayer/IJKMediaPlayer/IJKFFMoviePlayerDef.m index 04f64c56ea2d0df38675ec4823576a84f509e405..a1c9fcf8f79b987dad1a574d888abe2ab554d4d0 100644 --- a/ios/IJKMediaPlayer/IJKMediaPlayer/IJKFFMoviePlayerDef.m +++ b/ios/IJKMediaPlayer/IJKMediaPlayer/IJKFFMoviePlayerDef.m @@ -67,4 +67,4 @@ } } -@end \ No newline at end of file +@end diff --git a/ios/IJKMediaPlayer/IJKMediaPlayer/IJKFFMrl.m b/ios/IJKMediaPlayer/IJKMediaPlayer/IJKFFMrl.m index d1a1be0e3247f51fd195e792bfcf9b92062ede95..dc4766b6b4e70e915bdce113d6b84268354740a6 100644 --- a/ios/IJKMediaPlayer/IJKMediaPlayer/IJKFFMrl.m +++ b/ios/IJKMediaPlayer/IJKMediaPlayer/IJKFFMrl.m @@ -79,7 +79,7 @@ if (out_size > INT_MAX || !(utf8Plain = av_mallocz(out_size))) return NULL; - if ((ret = av_base64_decode(utf8Plain, utf8Cipher, out_size)) < 0) { + if ((ret = av_base64_decode(utf8Plain, utf8Cipher, (int)out_size)) < 0) { av_free(utf8Plain); NSLog(@"Invalid base64 in MRL\n"); return NULL; diff --git a/ios/IJKMediaPlayer/IJKMediaPlayer/IJKFFOptions.m b/ios/IJKMediaPlayer/IJKMediaPlayer/IJKFFOptions.m index e00d0ac6f4c577c5a05682f03e2020de833473dc..aca6aa47f9f31c4527ff29298c07676345017bb2 100644 --- a/ios/IJKMediaPlayer/IJKMediaPlayer/IJKFFOptions.m +++ b/ios/IJKMediaPlayer/IJKMediaPlayer/IJKFFOptions.m @@ -37,7 +37,7 @@ { ijkmp_set_codec_option(mediaPlayer, [optionName UTF8String], - [[NSString stringWithFormat:@"%d", value] UTF8String]); + [[NSString stringWithFormat:@"%d", (int)value] UTF8String]); } @end diff --git a/ios/IJKMediaPlayer/IJKMediaPlayer/IJKMediaPlayback.m b/ios/IJKMediaPlayer/IJKMediaPlayer/IJKMediaPlayback.m index bf47dcfe907d66b4d2bfeca7edb42986499e078a..0cad2e277ab3febaf27003eac31310d559f8fb62 100644 --- a/ios/IJKMediaPlayer/IJKMediaPlayer/IJKMediaPlayback.m +++ b/ios/IJKMediaPlayer/IJKMediaPlayer/IJKMediaPlayback.m @@ -26,4 +26,4 @@ NSString *const IJKMediaPlaybackIsPreparedToPlayDidChangeNotification = @"IJKMed NSString *const IJKMoviePlayerLoadStateDidChangeNotification = @"IJKMoviePlayerLoadStateDidChangeNotification"; NSString *const IJKMoviePlayerPlaybackDidFinishNotification = @"IJKMoviePlayerPlaybackDidFinishNotification"; -NSString *const IJKMoviePlayerPlaybackStateDidChangeNotification = @"IJKMoviePlayerPlaybackStateDidChangeNotification"; \ No newline at end of file +NSString *const IJKMoviePlayerPlaybackStateDidChangeNotification = @"IJKMoviePlayerPlaybackStateDidChangeNotification"; diff --git a/ios/IJKMediaPlayer/IJKMediaPlayer/IJKMediaPlayer.h b/ios/IJKMediaPlayer/IJKMediaPlayer/IJKMediaPlayer.h index f1f14eb8338f2ba3546659b9e9f1dac8bbfb612a..76e3dae73fd6be2969b9373116fdefbc0cd49539 100644 --- a/ios/IJKMediaPlayer/IJKMediaPlayer/IJKMediaPlayer.h +++ b/ios/IJKMediaPlayer/IJKMediaPlayer/IJKMediaPlayer.h @@ -25,4 +25,4 @@ #import "IJKMPMoviePlayerController.h" #import "IJKFFOptions.h" -#import "IJKFFMoviePlayerController.h" \ No newline at end of file +#import "IJKFFMoviePlayerController.h" diff --git a/ios/IJKMediaPlayer/IJKMediaPlayer/ijkmedia/ijksdl/ios/IJKSDLAudioUnitController.m b/ios/IJKMediaPlayer/IJKMediaPlayer/ijkmedia/ijksdl/ios/IJKSDLAudioUnitController.m index 0df384a90755f64d5467d2bda460cf91752728d7..a89cbd4830546a39b9926c6678169671e24f27d8 100644 --- a/ios/IJKMediaPlayer/IJKMediaPlayer/ijkmedia/ijksdl/ios/IJKSDLAudioUnitController.m +++ b/ios/IJKMediaPlayer/IJKMediaPlayer/ijkmedia/ijksdl/ios/IJKSDLAudioUnitController.m @@ -70,7 +70,7 @@ &flag, sizeof(flag)); if (status != noErr) { - ALOGE("AudioUnit: failed to set IO mode (%li)", status); + ALOGE("AudioUnit: failed to set IO mode (%d)", (int)status); } /* Get the current format */ @@ -102,7 +102,7 @@ &streamDescription, i_param_size); if (status != noErr) { - ALOGE("AudioUnit: failed to set stream format (%li)", status); + ALOGE("AudioUnit: failed to set stream format (%d)", (int)status); self = nil; return nil; } @@ -115,7 +115,7 @@ &streamDescription, &i_param_size); if (status != noErr) { - ALOGE("AudioUnit: failed to verify stream format (%li)", status); + ALOGE("AudioUnit: failed to verify stream format (%d)", (int)status); } AURenderCallbackStruct callback; @@ -126,7 +126,7 @@ kAudioUnitScope_Input, 0, &callback, sizeof(callback)); if (status != noErr) { - ALOGE("AudioUnit: render callback setup failed (%li)", status); + ALOGE("AudioUnit: render callback setup failed (%d)", (int)status); self = nil; return nil; } @@ -136,7 +136,7 @@ /* AU initiliaze */ status = AudioUnitInitialize(auUnit); if (status != noErr) { - ALOGE("AudioUnit: AudioUnitInitialize failed (%li)", status); + ALOGE("AudioUnit: AudioUnitInitialize failed (%d)", (int)status); self = nil; return nil; } @@ -204,7 +204,7 @@ OSStatus status = AudioOutputUnitStop(_auUnit); if (status != noErr) - ALOGE("AudioUnit: failed to stop AudioUnit (%li)", status); + ALOGE("AudioUnit: failed to stop AudioUnit (%d)", (int)status); } - (void)close diff --git a/ios/IJKMediaPlayer/IJKMediaPlayer/ijkmedia/ijksdl/ios/IJKSDLGLRenderI420.m b/ios/IJKMediaPlayer/IJKMediaPlayer/ijkmedia/ijksdl/ios/IJKSDLGLRenderI420.m index f572c3be901141f3be7d3130613b1440d798abc9..e327b7384538fef74d18e68209968e9ce866461c 100644 --- a/ios/IJKMediaPlayer/IJKMediaPlayer/ijkmedia/ijksdl/ios/IJKSDLGLRenderI420.m +++ b/ios/IJKMediaPlayer/IJKMediaPlayer/ijkmedia/ijksdl/ios/IJKSDLGLRenderI420.m @@ -96,8 +96,8 @@ static NSString *const g_yuvFragmentShaderString = IJK_SHADER_STRING glTexImage2D(GL_TEXTURE_2D, 0, GL_LUMINANCE, - widths[i], - heights[i], + (int)widths[i], + (int)heights[i], 0, GL_LUMINANCE, GL_UNSIGNED_BYTE, diff --git a/ios/IJKMediaPlayer/IJKMediaPlayer/ijkmedia/ijksdl/ios/IJKSDLGLRenderRV24.m b/ios/IJKMediaPlayer/IJKMediaPlayer/ijkmedia/ijksdl/ios/IJKSDLGLRenderRV24.m index 0b219a506172b538b80965173ac7f5bdb3824bfc..b45ed87e3f56b9fe20cb8e2d7d1e4acd28668be6 100644 --- a/ios/IJKMediaPlayer/IJKMediaPlayer/ijkmedia/ijksdl/ios/IJKSDLGLRenderRV24.m +++ b/ios/IJKMediaPlayer/IJKMediaPlayer/ijkmedia/ijksdl/ios/IJKSDLGLRenderRV24.m @@ -79,8 +79,8 @@ static NSString *const g_rgbFragmentShaderString = IJK_SHADER_STRING glTexImage2D(GL_TEXTURE_2D, 0, GL_RGB, - widths[i], - heights[i], + (int)widths[i], + (int)heights[i], 0, GL_RGB, GL_UNSIGNED_BYTE, diff --git a/ios/IJKMediaPlayer/IJKMediaPlayer/ijkmedia/ijksdl/ios/IJKSDLGLView.m b/ios/IJKMediaPlayer/IJKMediaPlayer/ijkmedia/ijksdl/ios/IJKSDLGLView.m index 91243f6a87bb1c37af5f06945558648876f4af3e..513dcedc817c3b82cc8effdf53c193cf27977ded 100644 --- a/ios/IJKMediaPlayer/IJKMediaPlayer/ijkmedia/ijksdl/ios/IJKSDLGLView.m +++ b/ios/IJKMediaPlayer/IJKMediaPlayer/ijkmedia/ijksdl/ios/IJKSDLGLView.m @@ -170,7 +170,7 @@ enum { return [CAEAGLLayer class]; } -- (id) initWithFrame:(CGRect)frame withChroma:(NSInteger)chroma +- (id) initWithFrame:(CGRect)frame withChroma:(int)chroma { self = [super initWithFrame:frame]; if (self) { diff --git a/ios/IJKMediaPlayer/IJKMediaPlayer/ijkmedia/ijksdl/ios/ijksdl_thread_ios.m b/ios/IJKMediaPlayer/IJKMediaPlayer/ijkmedia/ijksdl/ios/ijksdl_thread_ios.m index dcca5328241a26e8ec6b307a362e4a36227bab06..fe77f92f3d0b43038d4ef0ff7c4355494f3bcc59 100644 --- a/ios/IJKMediaPlayer/IJKMediaPlayer/ijkmedia/ijksdl/ios/ijksdl_thread_ios.m +++ b/ios/IJKMediaPlayer/IJKMediaPlayer/ijkmedia/ijksdl/ios/ijksdl_thread_ios.m @@ -42,4 +42,4 @@ SDL_Thread *SDL_CreateThreadEx(SDL_Thread *thread, int (*fn)(void *), void *data return NULL; return thread; -} \ No newline at end of file +} diff --git a/ios/tools/do-compile-ffmpeg.sh b/ios/tools/do-compile-ffmpeg.sh index c739177e6e1ad0aa183aac72e84710ad36daefb7..58d964c260704e5d8435a06693d9901ca346c96b 100755 --- a/ios/tools/do-compile-ffmpeg.sh +++ b/ios/tools/do-compile-ffmpeg.sh @@ -73,28 +73,31 @@ echo "====================" FF_BUILD_NAME="unknown" FF_XCRUN_PLATFORM="iPhoneOS" -FF_XCRUN_SIMULATOR= +FF_XCRUN_OSVERSION= if [ "$FF_ARCH" == "i386" ]; then FF_BUILD_NAME="ffmpeg-i386" FF_XCRUN_PLATFORM="iPhoneSimulator" - FF_XCRUN_SIMULATOR="-mios-simulator-version-min=5.0" + FF_XCRUN_OSVERSION="-mios-simulator-version-min=5.1.1" FFMPEG_CFG_FLAGS="$FFMPEG_CFG_FLAGS $FFMPEG_CFG_FLAGS_SIMULATOR" elif [ "$FF_ARCH" == "x86_64" ]; then FF_BUILD_NAME="ffmpeg-x86_64" FF_XCRUN_PLATFORM="iPhoneSimulator" - FF_XCRUN_SIMULATOR="-mios-simulator-version-min=7.0" + FF_XCRUN_OSVERSION="-mios-simulator-version-min=7.0" FFMPEG_CFG_FLAGS="$FFMPEG_CFG_FLAGS $FFMPEG_CFG_FLAGS_SIMULATOR" elif [ "$FF_ARCH" == "armv7" ]; then FF_BUILD_NAME="ffmpeg-armv7" + FF_XCRUN_OSVERSION="-miphoneos-version-min=5.1.1" FFMPEG_CFG_FLAGS="$FFMPEG_CFG_FLAGS $FFMPEG_CFG_FLAGS_ARM" # FFMPEG_CFG_CPU="--cpu=cortex-a8" elif [ "$FF_ARCH" == "armv7s" ]; then FF_BUILD_NAME="ffmpeg-armv7s" FFMPEG_CFG_CPU="--cpu=swift" + FF_XCRUN_OSVERSION="-miphoneos-version-min=5.1.1" FFMPEG_CFG_FLAGS="$FFMPEG_CFG_FLAGS $FFMPEG_CFG_FLAGS_ARM" elif [ "$FF_ARCH" == "arm64" ]; then FF_BUILD_NAME="ffmpeg-arm64" + FF_XCRUN_OSVERSION="-miphoneos-version-min=5.1.1" FFMPEG_CFG_FLAGS="$FFMPEG_CFG_FLAGS $FFMPEG_CFG_FLAGS_ARM" else echo "unknown architecture $FF_ARCH"; @@ -103,7 +106,7 @@ fi echo "build_name: $FF_BUILD_NAME" echo "platform: $FF_XCRUN_PLATFORM" -echo "simulator: $FF_XCRUN_SIMULATOR" +echo "osversion: $FF_XCRUN_OSVERSION" #-------------------- echo "====================" @@ -131,7 +134,7 @@ FFMPEG_CFG_FLAGS="$FFMPEG_CFG_FLAGS $FFMPEG_CFG_CPU" FFMPEG_CFLAGS= FFMPEG_CFLAGS="$FFMPEG_CFLAGS -arch $FF_ARCH" -FFMPEG_CFLAGS="$FFMPEG_CFLAGS $FF_XCRUN_SIMULATOR" +FFMPEG_CFLAGS="$FFMPEG_CFLAGS $FF_XCRUN_OSVERSION" FFMPEG_CFLAGS="$FFMPEG_CFLAGS $FFMPEG_EXTRA_CFLAGS" FFMPEG_CXXFLAGS="$FFMPEG_CFLAGS" FFMPEG_LDFLAGS="$FFMPEG_CFLAGS"