Skip to content
This repository has been archived by the owner on Sep 16, 2023. It is now read-only.

Commit

Permalink
Update to ffmpeg 6.0
Browse files Browse the repository at this point in the history
  • Loading branch information
@CarterLi
CarterLi committed Mar 1, 2023
1 parent 2ce390d commit 3cbe7b8
Show file tree
Hide file tree
Showing 2 changed files with 31 additions and 21 deletions.
50 changes: 30 additions & 20 deletions iina.xcodeproj/project.pbxproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,8 +21,6 @@
51B494D82718FDD700B9381A /* PlaySliderLoopKnob.swift in Sources */ = {isa = PBXBuildFile; fileRef = 51B494D72718FDD700B9381A /* PlaySliderLoopKnob.swift */; };
51F7974728C7E00200812D0D /* Lock.swift in Sources */ = {isa = PBXBuildFile; fileRef = 51F7974628C7E00200812D0D /* Lock.swift */; };
6100FF2B1EDF9806002CF0FB /* dsa_pub.pem in Resources */ = {isa = PBXBuildFile; fileRef = 6100FF2A1EDF9806002CF0FB /* dsa_pub.pem */; };
6FC3EFAF27AC0FEA00D3D557 /* libswscale.6.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = AD0478A827953DCE005A6B9E /* libswscale.6.dylib */; };
6FC3EFB027AC0FEA00D3D557 /* libswscale.6.dylib in Embed Libraries */ = {isa = PBXBuildFile; fileRef = AD0478A827953DCE005A6B9E /* libswscale.6.dylib */; settings = {ATTRIBUTES = (CodeSignOnCopy, ); }; };
8400D5C41E17C6D2006785F5 /* AboutWindowController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 8400D5C21E17C6D2006785F5 /* AboutWindowController.swift */; };
8400D5C61E1AB2F1006785F5 /* MainWindowController.xib in Resources */ = {isa = PBXBuildFile; fileRef = 8400D5C81E1AB2F1006785F5 /* MainWindowController.xib */; };
8400D5C91E1AB2F9006785F5 /* QuickSettingViewController.xib in Resources */ = {isa = PBXBuildFile; fileRef = 8400D5CB1E1AB2F9006785F5 /* QuickSettingViewController.xib */; };
Expand Down Expand Up @@ -159,16 +157,18 @@
84FBF23E1EF06A90003EA491 /* ThumbnailCache.swift in Sources */ = {isa = PBXBuildFile; fileRef = 84FBF23D1EF06A90003EA491 /* ThumbnailCache.swift */; };
8F49C36E213EFB7E0076C4F9 /* MiniPlayerWindowController.xib in Resources */ = {isa = PBXBuildFile; fileRef = 8F49C370213EFB7E0076C4F9 /* MiniPlayerWindowController.xib */; };
9E47DAC01E3CFA6D00457420 /* DurationDisplayTextField.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9E47DABF1E3CFA6D00457420 /* DurationDisplayTextField.swift */; };
AD0478B327953DCF005A6B9E /* libavutil.57.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = AD0478A627953DCE005A6B9E /* libavutil.57.dylib */; };
AD0478B427953DCF005A6B9E /* libavutil.57.dylib in Embed Libraries */ = {isa = PBXBuildFile; fileRef = AD0478A627953DCE005A6B9E /* libavutil.57.dylib */; settings = {ATTRIBUTES = (CodeSignOnCopy, ); }; };
AD0478B927953DCF005A6B9E /* libavcodec.59.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = AD0478A927953DCE005A6B9E /* libavcodec.59.dylib */; };
AD0478BA27953DCF005A6B9E /* libavcodec.59.dylib in Embed Libraries */ = {isa = PBXBuildFile; fileRef = AD0478A927953DCE005A6B9E /* libavcodec.59.dylib */; settings = {ATTRIBUTES = (CodeSignOnCopy, ); }; };
AD0478BD27953DCF005A6B9E /* libavfilter.8.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = AD0478AB27953DCE005A6B9E /* libavfilter.8.dylib */; };
AD0478BE27953DCF005A6B9E /* libavfilter.8.dylib in Embed Libraries */ = {isa = PBXBuildFile; fileRef = AD0478AB27953DCE005A6B9E /* libavfilter.8.dylib */; settings = {ATTRIBUTES = (CodeSignOnCopy, ); }; };
AD0478C727953DCF005A6B9E /* libavformat.59.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = AD0478B027953DCF005A6B9E /* libavformat.59.dylib */; };
AD0478C827953DCF005A6B9E /* libavformat.59.dylib in Embed Libraries */ = {isa = PBXBuildFile; fileRef = AD0478B027953DCF005A6B9E /* libavformat.59.dylib */; settings = {ATTRIBUTES = (CodeSignOnCopy, ); }; };
AD43B0AB2782F78D009ADE68 /* DanmakuView.swift in Sources */ = {isa = PBXBuildFile; fileRef = AD43B0AA2782F78D009ADE68 /* DanmakuView.swift */; };
AD43B0AD2782FBC4009ADE68 /* danmaku.html in Resources */ = {isa = PBXBuildFile; fileRef = AD43B0AC2782FBC4009ADE68 /* danmaku.html */; };
AD63BF7B29AEF1A000A63251 /* libavformat.60.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = AD63BF7629AEF1A000A63251 /* libavformat.60.dylib */; };
AD63BF7C29AEF1A000A63251 /* libavformat.60.dylib in Embed Libraries */ = {isa = PBXBuildFile; fileRef = AD63BF7629AEF1A000A63251 /* libavformat.60.dylib */; settings = {ATTRIBUTES = (CodeSignOnCopy, ); }; };
AD63BF7D29AEF1A000A63251 /* libavutil.58.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = AD63BF7729AEF1A000A63251 /* libavutil.58.dylib */; };
AD63BF7E29AEF1A100A63251 /* libavutil.58.dylib in Embed Libraries */ = {isa = PBXBuildFile; fileRef = AD63BF7729AEF1A000A63251 /* libavutil.58.dylib */; settings = {ATTRIBUTES = (CodeSignOnCopy, ); }; };
AD63BF7F29AEF1A100A63251 /* libavfilter.9.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = AD63BF7829AEF1A000A63251 /* libavfilter.9.dylib */; };
AD63BF8029AEF1A100A63251 /* libavfilter.9.dylib in Embed Libraries */ = {isa = PBXBuildFile; fileRef = AD63BF7829AEF1A000A63251 /* libavfilter.9.dylib */; settings = {ATTRIBUTES = (CodeSignOnCopy, ); }; };
AD63BF8129AEF1A100A63251 /* libswscale.7.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = AD63BF7929AEF1A000A63251 /* libswscale.7.dylib */; };
AD63BF8229AEF1A100A63251 /* libswscale.7.dylib in Embed Libraries */ = {isa = PBXBuildFile; fileRef = AD63BF7929AEF1A000A63251 /* libswscale.7.dylib */; settings = {ATTRIBUTES = (CodeSignOnCopy, ); }; };
AD63BF8329AEF1A100A63251 /* libavcodec.60.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = AD63BF7A29AEF1A000A63251 /* libavcodec.60.dylib */; };
AD63BF8429AEF1A100A63251 /* libavcodec.60.dylib in Embed Libraries */ = {isa = PBXBuildFile; fileRef = AD63BF7A29AEF1A000A63251 /* libavcodec.60.dylib */; settings = {ATTRIBUTES = (CodeSignOnCopy, ); }; };
AD70988927E0DD9200BD7795 /* libmpv.2.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = AD70988827E0DD9200BD7795 /* libmpv.2.dylib */; };
AD70988A27E0DD9200BD7795 /* libmpv.2.dylib in Embed Libraries */ = {isa = PBXBuildFile; fileRef = AD70988827E0DD9200BD7795 /* libmpv.2.dylib */; settings = {ATTRIBUTES = (CodeSignOnCopy, ); }; };
B206FFD92415439600E3B8B7 /* FourCharCode+Extensions.swift in Sources */ = {isa = PBXBuildFile; fileRef = B206FFD82415439600E3B8B7 /* FourCharCode+Extensions.swift */; };
Expand Down Expand Up @@ -297,12 +297,12 @@
dstPath = "";
dstSubfolderSpec = 10;
files = (
AD63BF8029AEF1A100A63251 /* libavfilter.9.dylib in Embed Libraries */,
AD70988A27E0DD9200BD7795 /* libmpv.2.dylib in Embed Libraries */,
6FC3EFB027AC0FEA00D3D557 /* libswscale.6.dylib in Embed Libraries */,
AD0478C827953DCF005A6B9E /* libavformat.59.dylib in Embed Libraries */,
AD0478BA27953DCF005A6B9E /* libavcodec.59.dylib in Embed Libraries */,
AD0478BE27953DCF005A6B9E /* libavfilter.8.dylib in Embed Libraries */,
AD0478B427953DCF005A6B9E /* libavutil.57.dylib in Embed Libraries */,
AD63BF7E29AEF1A100A63251 /* libavutil.58.dylib in Embed Libraries */,
AD63BF8429AEF1A100A63251 /* libavcodec.60.dylib in Embed Libraries */,
AD63BF7C29AEF1A000A63251 /* libavformat.60.dylib in Embed Libraries */,
AD63BF8229AEF1A100A63251 /* libswscale.7.dylib in Embed Libraries */,
);
name = "Embed Libraries";
runOnlyForDeploymentPostprocessing = 0;
Expand Down Expand Up @@ -940,6 +940,11 @@
AD183C2E2768376A00758D8A /* libmpv.1.dylib */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.dylib"; name = libmpv.1.dylib; path = deps/lib/libmpv.1.dylib; sourceTree = "<group>"; };
AD43B0AA2782F78D009ADE68 /* DanmakuView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = DanmakuView.swift; sourceTree = "<group>"; };
AD43B0AC2782FBC4009ADE68 /* danmaku.html */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.html; path = danmaku.html; sourceTree = "<group>"; };
AD63BF7629AEF1A000A63251 /* libavformat.60.dylib */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.dylib"; name = libavformat.60.dylib; path = deps/lib/libavformat.60.dylib; sourceTree = "<group>"; };
AD63BF7729AEF1A000A63251 /* libavutil.58.dylib */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.dylib"; name = libavutil.58.dylib; path = deps/lib/libavutil.58.dylib; sourceTree = "<group>"; };
AD63BF7829AEF1A000A63251 /* libavfilter.9.dylib */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.dylib"; name = libavfilter.9.dylib; path = deps/lib/libavfilter.9.dylib; sourceTree = "<group>"; };
AD63BF7929AEF1A000A63251 /* libswscale.7.dylib */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.dylib"; name = libswscale.7.dylib; path = deps/lib/libswscale.7.dylib; sourceTree = "<group>"; };
AD63BF7A29AEF1A000A63251 /* libavcodec.60.dylib */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.dylib"; name = libavcodec.60.dylib; path = deps/lib/libavcodec.60.dylib; sourceTree = "<group>"; };
AD70988827E0DD9200BD7795 /* libmpv.2.dylib */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.dylib"; name = libmpv.2.dylib; path = deps/lib/libmpv.2.dylib; sourceTree = "<group>"; };
B206FFD82415439600E3B8B7 /* FourCharCode+Extensions.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "FourCharCode+Extensions.swift"; sourceTree = "<group>"; };
B2133D69240D8FDA001B6095 /* IINA.sdef */ = {isa = PBXFileReference; lastKnownFileType = text; path = IINA.sdef; sourceTree = "<group>"; };
Expand Down Expand Up @@ -1245,18 +1250,18 @@
buildActionMask = 2147483647;
files = (
B4E4470125CE3F930069F06E /* Sparkle in Frameworks */,
6FC3EFAF27AC0FEA00D3D557 /* libswscale.6.dylib in Frameworks */,
AD63BF7B29AEF1A000A63251 /* libavformat.60.dylib in Frameworks */,
8451E6D92604AEFC009A15D7 /* Just in Frameworks */,
511527B728069C7C00B3A097 /* Algorithms in Frameworks */,
496B19921E2968530035AF10 /* PIP.framework in Frameworks */,
AD0478C727953DCF005A6B9E /* libavformat.59.dylib in Frameworks */,
AD0478B927953DCF005A6B9E /* libavcodec.59.dylib in Frameworks */,
8403CEA72007CBD400645516 /* MediaPlayer.framework in Frameworks */,
AD0478BD27953DCF005A6B9E /* libavfilter.8.dylib in Frameworks */,
5171A3E627A1034E009F5780 /* Atomics in Frameworks */,
AD63BF7D29AEF1A000A63251 /* libavutil.58.dylib in Frameworks */,
AD63BF8129AEF1A100A63251 /* libswscale.7.dylib in Frameworks */,
AD63BF7F29AEF1A100A63251 /* libavfilter.9.dylib in Frameworks */,
B4E446F225CB53FF0069F06E /* Gzip in Frameworks */,
AD70988927E0DD9200BD7795 /* libmpv.2.dylib in Frameworks */,
AD0478B327953DCF005A6B9E /* libavutil.57.dylib in Frameworks */,
AD63BF8329AEF1A100A63251 /* libavcodec.60.dylib in Frameworks */,
B4E446E825CB53920069F06E /* PromiseKit in Frameworks */,
B4E446F725CB54EF0069F06E /* Mustache in Frameworks */,
);
Expand Down Expand Up @@ -1368,6 +1373,11 @@
848290731D95978100C3C76C /* Frameworks */ = {
isa = PBXGroup;
children = (
AD63BF7A29AEF1A000A63251 /* libavcodec.60.dylib */,
AD63BF7829AEF1A000A63251 /* libavfilter.9.dylib */,
AD63BF7629AEF1A000A63251 /* libavformat.60.dylib */,
AD63BF7729AEF1A000A63251 /* libavutil.58.dylib */,
AD63BF7929AEF1A000A63251 /* libswscale.7.dylib */,
AD70988827E0DD9200BD7795 /* libmpv.2.dylib */,
AD0478A927953DCE005A6B9E /* libavcodec.59.dylib */,
AD0478AB27953DCE005A6B9E /* libavfilter.8.dylib */,
Expand Down
2 changes: 1 addition & 1 deletion iina/MPVOption.swift
View file
Original file line number Diff line number Diff line change
Expand Up @@ -258,7 +258,7 @@ struct MPVOption {
static let vdLavcSoftwareFallback = "vd-lavc-software-fallback"
/** --vd-lavc-film-grain=<auto|cpu|gpu> */
static let vdLavcFilmGrain = "vd-lavc-film-grain"
/** --vd-lavc-dr=<yes|no> */
/** --vd-lavc-dr=<auto|yes|no> */
static let vdLavcDr = "vd-lavc-dr"
/** --vd-lavc-bitexact */
static let vdLavcBitexact = "vd-lavc-bitexact"
Expand Down

0 comments on commit 3cbe7b8

Please sign in to comment.