Merge pull request #45 from hcorion/master

Add mpeg4 on Linux. Update Linux x86_64 libs and headers, rebuild x86 with mpeg4 support.
hrydgard · Aug 16, 2017 · 7b7ae7b · 7b7ae7b
2 parents a2e98d7 + 0801c8f
commit 7b7ae7b
Show file tree

Hide file tree

Showing 67 changed files with 2,581 additions and 1,327 deletions.
diff --git a/linux/x86/include/libavutil/ffversion.h b/linux/x86/include/libavutil/ffversion.h
@@ -1,5 +1,5 @@
 /* Automatically generated by version.sh, do not manually edit! */
 #ifndef AVUTIL_FFVERSION_H
 #define AVUTIL_FFVERSION_H
-#define FFMPEG_VERSION "81379c5"
+#define FFMPEG_VERSION "aa09a9a"
 #endif /* AVUTIL_FFVERSION_H */
diff --git a/linux/x86/lib/libavcodec.a b/linux/x86/lib/libavcodec.a
diff --git a/linux/x86/lib/libavformat.a b/linux/x86/lib/libavformat.a
diff --git a/linux/x86/lib/libavutil.a b/linux/x86/lib/libavutil.a
diff --git a/linux/x86/lib/libswresample.a b/linux/x86/lib/libswresample.a
diff --git a/linux/x86/lib/libswscale.a b/linux/x86/lib/libswscale.a