diff --git a/CocoaSplit.xcodeproj/project.pbxproj b/CocoaSplit.xcodeproj/project.pbxproj index f7c12db9..d749d915 100644 --- a/CocoaSplit.xcodeproj/project.pbxproj +++ b/CocoaSplit.xcodeproj/project.pbxproj @@ -276,8 +276,8 @@ 34AE3C43164E410D0052C95E /* XPCListenerDelegate.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = XPCListenerDelegate.m; sourceTree = ""; }; 34AE3C46164E560C0052C95E /* QTHelperProtocol.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = QTHelperProtocol.h; sourceTree = ""; }; 34AE3C69164F01800052C95E /* CapturedFrameProtocol.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = CapturedFrameProtocol.h; sourceTree = ""; }; - 34AE3C6A164F04B30052C95E /* IOSurface.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = IOSurface.framework; path = ../../../../System/Library/Frameworks/IOSurface.framework; sourceTree = ""; }; - 34AE3C6C164F04C90052C95E /* CoreVideo.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreVideo.framework; path = ../../../../System/Library/Frameworks/CoreVideo.framework; sourceTree = ""; }; + 34AE3C6A164F04B30052C95E /* IOSurface.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = IOSurface.framework; path = System/Library/Frameworks/IOSurface.framework; sourceTree = SDKROOT; }; + 34AE3C6C164F04C90052C95E /* CoreVideo.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreVideo.framework; path = System/Library/Frameworks/CoreVideo.framework; sourceTree = SDKROOT; }; 34B026581712D8BA0063BB2D /* CmdLineDelegate.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CmdLineDelegate.h; sourceTree = ""; }; 34B026591712D8BA0063BB2D /* CmdLineDelegate.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = CmdLineDelegate.m; sourceTree = ""; }; 34B74BC71648D23B00818DE2 /* QTCapture.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = QTCapture.h; sourceTree = ""; }; @@ -989,6 +989,7 @@ /usr/local/lib/libmp3lame.a, /usr/local/lib/libswscale.a, /usr/local/lib/libx264.a, + /usr/lib/libiconv.dylib, ); PRODUCT_NAME = CocoaSplit; SDKROOT = macosx; @@ -1012,12 +1013,13 @@ INFOPLIST_FILE = "CocoaSplit/CocoaSplit-Info.plist"; "LIBRARY_SEARCH_PATHS[arch=*]" = /usr/local/lib; "OTHER_LDFLAGS[arch=*]" = ( - /usr/local/lib/libavformat.a, /usr/local/lib/libavutil.a, + /usr/local/lib/libavformat.a, /usr/local/lib/libavcodec.a, /usr/local/lib/libmp3lame.a, /usr/local/lib/libswscale.a, /usr/local/lib/libx264.a, + /usr/lib/libiconv.dylib, ); PRODUCT_NAME = CocoaSplit; SDKROOT = macosx; @@ -1072,12 +1074,13 @@ MACOSX_DEPLOYMENT_TARGET = 10.8; ONLY_ACTIVE_ARCH = YES; "OTHER_LDFLAGS[arch=*]" = ( - /usr/local/lib/libavformat.a, /usr/local/lib/libavutil.a, + /usr/local/lib/libavformat.a, /usr/local/lib/libavcodec.a, - /usr/local/lib/libswscale.a, /usr/local/lib/libmp3lame.a, + /usr/local/lib/libswscale.a, /usr/local/lib/libx264.a, + /usr/lib/libiconv.dylib, ); PRODUCT_NAME = "$(TARGET_NAME)"; SDKROOT = macosx; @@ -1100,12 +1103,13 @@ GCC_PREFIX_HEADER = "CocoaSplitCmd/CocoaSplitCmd-Prefix.pch"; MACOSX_DEPLOYMENT_TARGET = 10.8; "OTHER_LDFLAGS[arch=*]" = ( + /usr/local/lib/libavutil.a, /usr/local/lib/libavformat.a, - /usr/local/lib/libswscale.a, /usr/local/lib/libavcodec.a, - /usr/local/lib/libavutil.a, - /usr/local/lib/libx264.a, /usr/local/lib/libmp3lame.a, + /usr/local/lib/libswscale.a, + /usr/local/lib/libx264.a, + /usr/lib/libiconv.dylib, ); PRODUCT_NAME = "$(TARGET_NAME)"; SDKROOT = macosx; diff --git a/CocoaSplit/FFMpegTask.m b/CocoaSplit/FFMpegTask.m index d9658b0a..3d149b0f 100644 --- a/CocoaSplit/FFMpegTask.m +++ b/CocoaSplit/FFMpegTask.m @@ -499,7 +499,7 @@ -(void) writeAVPacket:(AVPacket *)pkt codec_ctx:(AVCodecContext *)codec_ctx AVPacket *p = av_malloc(sizeof (AVPacket)); - memcpy(p, pkt, sizeof(AVPacket)); + av_copy_packet(p, pkt); p->destruct = NULL; av_dup_packet(p); diff --git a/README.md b/README.md index 518492d1..ba0230cf 100644 --- a/README.md +++ b/README.md @@ -44,3 +44,7 @@ Supported Platforms So far only tested on a Retina MacbookPro running Mountain Lion (10.8) +Building: +Install [Homebrew](http://brew.sh/#install) +Run `brew install ffmpeg --without-lame --without-faac --without-xvid && brew install imagemagick` in Terminal +Xcode project should now compile