From 1ca362aaad94f5017fa4607a881b80ef327679ba Mon Sep 17 00:00:00 2001
From: zhangmeng <775834166@qq.com>
Date: 星期一, 30 十二月 2019 13:15:51 +0800
Subject: [PATCH] Merge branch 'master' of ssh://192.168.5.5:29418/valib/goffmpeg

---
 csrc/thirdparty/ffmpeg/include/libavutil/ffversion.h |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/csrc/thirdparty/ffmpeg/include/libavutil/ffversion.h b/csrc/thirdparty/ffmpeg/include/libavutil/ffversion.h
index cc6acf9..f4377b7 100644
--- a/csrc/thirdparty/ffmpeg/include/libavutil/ffversion.h
+++ b/csrc/thirdparty/ffmpeg/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 "4.0.2"
+#define FFMPEG_VERSION "4.2"
 #endif /* AVUTIL_FFVERSION_H */

--
Gitblit v1.8.0