Merge CV, ver=5.1; ops/methods from HV, and interface from CV where possible

[goodguy/history.git] / cinelerra-5.0 / thirdparty / src / faac.patch1

diff --git a/cinelerra-5.0/thirdparty/src/faac.patch1 b/cinelerra-5.0/thirdparty/src/faac.patch1
deleted file mode 100644 (file)
index be4aa9a..0000000
--- a/cinelerra-5.0/thirdparty/src/faac.patch1
+++ /dev/null
@@ -1,18 +0,0 @@
---- faac-1.28/common/mp4v2/mpeg4ip.h.orig      2015-04-16 07:51:47.134014449 -0600
-+++ faac-1.28/common/mp4v2/mpeg4ip.h   2015-04-16 07:52:37.955396415 -0600
-@@ -120,6 +120,7 @@
- #endif
- #include <sys/param.h>
- 
-+#if 0
- #ifdef __cplusplus
- extern "C" {
- #endif
-@@ -127,6 +128,7 @@
- #ifdef __cplusplus
- }
- #endif
-+#endif
- 
- #define OPEN_RDWR O_RDWR
- #define OPEN_CREAT O_CREAT