diff options
| author | Moonchild <mcwerewolf@gmail.com> | 2018-04-27 19:15:26 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-04-27 19:15:26 +0200 |
| commit | c75dae3ed21bfa5a8ae46cd83d18329af5bea05a (patch) | |
| tree | ef657c38feb2368a3c86765778d1f068aa5eb614 /media/ffvpx/libavutil/version.h | |
| parent | c82c6d960a7f19d6595171f9705c43514f20c1ec (diff) | |
| parent | 6ada4b14e4cfc91f5f1b2556623cab691f3ab813 (diff) | |
| download | UXP-c75dae3ed21bfa5a8ae46cd83d18329af5bea05a.tar UXP-c75dae3ed21bfa5a8ae46cd83d18329af5bea05a.tar.gz UXP-c75dae3ed21bfa5a8ae46cd83d18329af5bea05a.tar.lz UXP-c75dae3ed21bfa5a8ae46cd83d18329af5bea05a.tar.xz UXP-c75dae3ed21bfa5a8ae46cd83d18329af5bea05a.zip | |
Merge pull request #275 from trav90/ffvpx-resync
Resync ffvpx code with 3.4.2-release from upstream
Diffstat (limited to 'media/ffvpx/libavutil/version.h')
| -rw-r--r-- | media/ffvpx/libavutil/version.h | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/media/ffvpx/libavutil/version.h b/media/ffvpx/libavutil/version.h index bdd310f85..f594dc069 100644 --- a/media/ffvpx/libavutil/version.h +++ b/media/ffvpx/libavutil/version.h @@ -78,8 +78,9 @@ * @{ */ + #define LIBAVUTIL_VERSION_MAJOR 55 -#define LIBAVUTIL_VERSION_MINOR 34 +#define LIBAVUTIL_VERSION_MINOR 78 #define LIBAVUTIL_VERSION_MICRO 100 #define LIBAVUTIL_VERSION_INT AV_VERSION_INT(LIBAVUTIL_VERSION_MAJOR, \ @@ -135,6 +136,9 @@ #ifndef FF_API_PKT_PTS #define FF_API_PKT_PTS (LIBAVUTIL_VERSION_MAJOR < 56) #endif +#ifndef FF_API_CRYPTO_SIZE_T +#define FF_API_CRYPTO_SIZE_T (LIBAVUTIL_VERSION_MAJOR < 56) +#endif /** |