projects: Update for FFVS Project generator update.

ShiftMediaProject · Oct 9, 2016 · 23b028c · 23b028c
1 parent 5d08556
commit 23b028c
Show file tree

Hide file tree

Showing 7 changed files with 53 additions and 13 deletions.
diff --git a/SMP/config.h b/SMP/config.h
@@ -19,8 +19,8 @@
  * THE SOFTWARE.
  */
 
-#ifndef FFMPEG_CONFIG_H
-#define FFMPEG_CONFIG_H
+#ifndef SMP_CONFIG_H
+#define SMP_CONFIG_H
 #define FFMPEG_CONFIGURATION "--enable-gpl --enable-version3 --enable-avisynth --enable-libmp3lame --enable-libvorbis --enable-libspeex --enable-libopus --enable-libilbc --enable-libtheora --enable-libx264 --enable-libx265 --enable-libxvid --enable-libvpx --enable-libgme --enable-libmodplug --enable-libsoxr --enable-libfreetype --enable-fontconfig --enable-libfribidi --enable-libass --enable-gnutls --disable-schannel --enable-gmp --enable-libssh --enable-libcdio --enable-libbluray --enable-opengl --enable-nvenc --enable-libmfx --toolchain=msvc"
 #define FFMPEG_LICENSE "GPL version 3 or later"
 #define CONFIG_THIS_YEAR 2016
@@ -2309,4 +2309,4 @@
 #define CONFIG_LIBRTMPTE_PROTOCOL 0
 #define CONFIG_LIBSSH_PROTOCOL 1
 #define CONFIG_LIBSMBCLIENT_PROTOCOL 0
-#endif /* FFMPEG_CONFIG_H */
+#endif /* SMP_CONFIG_H */
diff --git a/SMP/libavcodec/bsf_list.c b/SMP/libavcodec/bsf_list.c
@@ -1,3 +1,23 @@
+/** Available items from bitstream filters
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
+ * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
+ */
 static const AVBitStreamFilter *bitstream_filters[] = {
     &ff_aac_adtstoasc_bsf,
     &ff_chomp_bsf,

diff --git a/SMP/libavformat/protocol_list.c b/SMP/libavformat/protocol_list.c
@@ -1,3 +1,23 @@
+/** Available items from url protocols
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
+ * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
+ */
 static const URLProtocol *url_protocols[] = {
     &ff_async_protocol,
     &ff_bluray_protocol,

diff --git a/SMP/libavutil/avconfig.h b/SMP/libavutil/avconfig.h
@@ -19,9 +19,9 @@
  * THE SOFTWARE.
  */
 
-#ifndef AVUTIL_AVCONFIG_H
-#define AVUTIL_AVCONFIG_H
+#ifndef SMP_LIBAVUTIL_AVCONFIG_H
+#define SMP_LIBAVUTIL_AVCONFIG_H
 #define AV_HAVE_BIGENDIAN 0
 #define AV_HAVE_FAST_UNALIGNED 1
 #define AV_HAVE_INCOMPATIBLE_LIBAV_ABI 0
-#endif /* AVUTIL_AVCONFIG_H */
+#endif /* SMP_LIBAVUTIL_AVCONFIG_H */
diff --git a/SMP/libavutil/ffversion.h b/SMP/libavutil/ffversion.h
@@ -19,7 +19,7 @@
  * THE SOFTWARE.
  */
 
-#ifndef AVUTIL_FFVERSION_H
-#define AVUTIL_FFVERSION_H
+#ifndef SMP_LIBAVUTIL_FFVERSION_H
+#define SMP_LIBAVUTIL_FFVERSION_H
 #define FFMPEG_VERSION "3.0.git"
-#endif /* AVUTIL_FFVERSION_H */
+#endif /* SMP_LIBAVUTIL_FFVERSION_H */
diff --git a/SMP/math.h b/SMP/math.h
@@ -22,8 +22,8 @@
  * THE SOFTWARE.
  */
 
-#ifndef _SMP_MATH_H
-#define _SMP_MATH_H
+#ifndef SMP_MATH_H
+#define SMP_MATH_H
 
 #ifdef __INTEL_COMPILER
     // Use the Intel Math library. This provides Intel processor optimized functions.

diff --git a/SMP/unistd.h b/SMP/unistd.h
@@ -21,8 +21,8 @@
  * THE SOFTWARE.
  */
 
-#ifndef _SMP_UNISTD_H_
-#define _SMP_UNISTD_H_
+#ifndef SMP_UNISTD_H
+#define SMP_UNISTD_H
 
 #ifndef _MSC_VER
 #   include_next <unistd.h>