diff --git a/ijkmedia/ijkplayer/Android.mk b/ijkmedia/ijkplayer/Android.mk index 92372abfe5ab73b4bfc5799b57eec47b413d4002..1741b680ad036796c2af5ccafff2ebe372227015 100644 --- a/ijkmedia/ijkplayer/Android.mk +++ b/ijkmedia/ijkplayer/Android.mk @@ -54,7 +54,7 @@ LOCAL_SRC_FILES += ijkavformat/allformats.c LOCAL_SRC_FILES += ijkavformat/ijklivehook.c LOCAL_SRC_FILES += ijkavformat/ijkmediadatasource.c -LOCAL_SRC_FILES += ijkavformat/async.c +LOCAL_SRC_FILES += ijkavformat/ijkasync.c LOCAL_SRC_FILES += ijkavformat/ijkurlhook.c LOCAL_SRC_FILES += ijkavformat/ijklongurl.c LOCAL_SRC_FILES += ijkavformat/ijksegment.c diff --git a/ijkmedia/ijkplayer/ijkavformat/async.c b/ijkmedia/ijkplayer/ijkavformat/ijkasync.c similarity index 100% rename from ijkmedia/ijkplayer/ijkavformat/async.c rename to ijkmedia/ijkplayer/ijkavformat/ijkasync.c diff --git a/ios/IJKMediaPlayer/IJKMediaPlayer.xcodeproj/project.pbxproj b/ios/IJKMediaPlayer/IJKMediaPlayer.xcodeproj/project.pbxproj index 2f18f9da617fb62ca47e839040115fcdc1976c46..58f8cac6b9493efe8525865987ccbe06134e90f0 100644 --- a/ios/IJKMediaPlayer/IJKMediaPlayer.xcodeproj/project.pbxproj +++ b/ios/IJKMediaPlayer/IJKMediaPlayer.xcodeproj/project.pbxproj @@ -7,7 +7,7 @@ objects = { /* Begin PBXBuildFile section */ - 54A029B61D4700E6001C61C1 /* async.c in Sources */ = {isa = PBXBuildFile; fileRef = 54A029B11D4700E6001C61C1 /* async.c */; }; + 54A029B61D4700E6001C61C1 /* ijkasync.c in Sources */ = {isa = PBXBuildFile; fileRef = 54A029B11D4700E6001C61C1 /* ijkasync.c */; }; 54A029B71D4700E6001C61C1 /* ijkavformat.h in Headers */ = {isa = PBXBuildFile; fileRef = 54A029B21D4700E6001C61C1 /* ijkavformat.h */; }; 54A029B81D4700E6001C61C1 /* ijklongurl.c in Sources */ = {isa = PBXBuildFile; fileRef = 54A029B31D4700E6001C61C1 /* ijklongurl.c */; }; 54A029B91D4700E6001C61C1 /* ijksegment.c in Sources */ = {isa = PBXBuildFile; fileRef = 54A029B41D4700E6001C61C1 /* ijksegment.c */; }; @@ -125,7 +125,7 @@ 4543162A1A66497900676070 /* IJKVideoToolBox.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = IJKVideoToolBox.m; path = ijkmedia/ijkplayer/ios/pipeline/IJKVideoToolBox.m; sourceTree = ""; }; 45DB4AA71A5D52AE005CAD41 /* ijksdl_vout_overlay_videotoolbox.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ijksdl_vout_overlay_videotoolbox.h; sourceTree = ""; }; 45DB4AA81A5D52AE005CAD41 /* ijksdl_vout_overlay_videotoolbox.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = ijksdl_vout_overlay_videotoolbox.m; sourceTree = ""; }; - 54A029B11D4700E6001C61C1 /* async.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = async.c; sourceTree = ""; }; + 54A029B11D4700E6001C61C1 /* ijkasync.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = ijkasync.c; sourceTree = ""; }; 54A029B21D4700E6001C61C1 /* ijkavformat.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ijkavformat.h; sourceTree = ""; }; 54A029B31D4700E6001C61C1 /* ijklongurl.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = ijklongurl.c; sourceTree = ""; }; 54A029B41D4700E6001C61C1 /* ijksegment.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = ijksegment.c; sourceTree = ""; }; @@ -597,7 +597,7 @@ E69BE5491B93FED300AFBA3F /* ijkavformat */ = { isa = PBXGroup; children = ( - 54A029B11D4700E6001C61C1 /* async.c */, + 54A029B11D4700E6001C61C1 /* ijkasync.c */, 54A029B21D4700E6001C61C1 /* ijkavformat.h */, 54A029B31D4700E6001C61C1 /* ijklongurl.c */, 54A029B41D4700E6001C61C1 /* ijksegment.c */, @@ -877,7 +877,7 @@ E654EAC11B6B287E00B0F2D0 /* ijksdl_audio.c in Sources */, E654EAC91B6B288A00B0F2D0 /* ijksdl_thread_ios.m in Sources */, E654EAB31B6B285900B0F2D0 /* ijkmeta.c in Sources */, - 54A029B61D4700E6001C61C1 /* async.c in Sources */, + 54A029B61D4700E6001C61C1 /* ijkasync.c in Sources */, E6E1B9A81C741F72000C6C72 /* renderer_yuv420sp_vtb.m in Sources */, E654EAD31B6B288A00B0F2D0 /* IJKSDLGLView.m in Sources */, E654EAC61B6B287E00B0F2D0 /* ijksdl_timer.c in Sources */,