diff options
author | Michael Niedermayer <[email protected]> | 2014-12-19 18:04:40 +0100 |
---|---|---|
committer | Michael Niedermayer <[email protected]> | 2015-01-20 03:27:17 +0100 |
commit | 3769601fb6d80f974e1c800b6890391cdc0f6f06 (patch) | |
tree | 357e428ca7cefb7ce97c4d9d53b0da296b2fee4e | |
parent | 2528468e204c906bf5f9a0a8dc25021bec14bb7c (diff) |
Add FFMPEG_VERSION into the binary libs
This simplifies identifying from which revision a binary of a lib came from
Signed-off-by: Michael Niedermayer <[email protected]>
(cherry picked from commit 649c158e8c94ac0cff7f03e97d6ea8bbf71b7f02)
Conflicts:
libavdevice/avdevice.c
libswresample/swresample.c
-rw-r--r-- | libavcodec/utils.c | 3 | ||||
-rw-r--r-- | libavdevice/avdevice.c | 3 | ||||
-rw-r--r-- | libavfilter/avfilter.c | 3 | ||||
-rw-r--r-- | libavformat/utils.c | 3 | ||||
-rw-r--r-- | libavutil/utils.c | 3 | ||||
-rw-r--r-- | libpostproc/postprocess.c | 3 | ||||
-rw-r--r-- | libswresample/swresample.c | 4 |
7 files changed, 22 insertions, 0 deletions
diff --git a/libavcodec/utils.c b/libavcodec/utils.c index 292d12b843..0872e32401 100644 --- a/libavcodec/utils.c +++ b/libavcodec/utils.c @@ -65,6 +65,9 @@ #include "compat/os2threads.h" #endif +#include "libavutil/ffversion.h" +const char av_codec_ffversion[] = "FFmpeg version " FFMPEG_VERSION; + #if HAVE_PTHREADS || HAVE_W32THREADS || HAVE_OS2THREADS static int default_lockmgr_cb(void **arg, enum AVLockOp op) { diff --git a/libavdevice/avdevice.c b/libavdevice/avdevice.c index cc0597377c..0e70b94efe 100644 --- a/libavdevice/avdevice.c +++ b/libavdevice/avdevice.c @@ -20,6 +20,9 @@ #include "avdevice.h" #include "config.h" +#include "libavutil/ffversion.h" +const char av_device_ffversion[] = "FFmpeg version " FFMPEG_VERSION; + unsigned avdevice_version(void) { av_assert0(LIBAVDEVICE_VERSION_MICRO >= 100); diff --git a/libavfilter/avfilter.c b/libavfilter/avfilter.c index 46f81f2d9e..582b28b483 100644 --- a/libavfilter/avfilter.c +++ b/libavfilter/avfilter.c @@ -37,6 +37,9 @@ #include "formats.h" #include "internal.h" +#include "libavutil/ffversion.h" +const char av_filter_ffversion[] = "FFmpeg version " FFMPEG_VERSION; + static int ff_filter_frame_framed(AVFilterLink *link, AVFrame *frame); void ff_tlog_ref(void *ctx, AVFrame *ref, int end) diff --git a/libavformat/utils.c b/libavformat/utils.c index 80a909ae48..c3cccd7564 100644 --- a/libavformat/utils.c +++ b/libavformat/utils.c @@ -53,6 +53,9 @@ #include "riff.h" #include "url.h" +#include "libavutil/ffversion.h" +const char av_format_ffversion[] = "FFmpeg version " FFMPEG_VERSION; + /** * @file * various utility functions for use within FFmpeg diff --git a/libavutil/utils.c b/libavutil/utils.c index 4c82503d9c..10f535995f 100644 --- a/libavutil/utils.c +++ b/libavutil/utils.c @@ -27,6 +27,9 @@ * various utility functions */ +#include "libavutil/ffversion.h" +const char av_util_ffversion[] = "FFmpeg version " FFMPEG_VERSION; + unsigned avutil_version(void) { static int checks_done; diff --git a/libpostproc/postprocess.c b/libpostproc/postprocess.c index 37206c5a48..f2757acc78 100644 --- a/libpostproc/postprocess.c +++ b/libpostproc/postprocess.c @@ -89,6 +89,9 @@ try to unroll inner for(x=0 ... loop to avoid these damn if(x ... checks #include "postprocess_internal.h" #include "libavutil/avstring.h" +#include "libavutil/ffversion.h" +const char postproc_ffversion[] = "FFmpeg version " FFMPEG_VERSION; + unsigned postproc_version(void) { av_assert0(LIBPOSTPROC_VERSION_MICRO >= 100); diff --git a/libswresample/swresample.c b/libswresample/swresample.c index 6818f2b90e..ad05617506 100644 --- a/libswresample/swresample.c +++ b/libswresample/swresample.c @@ -146,6 +146,10 @@ static const AVClass av_class = { .category = AV_CLASS_CATEGORY_SWRESAMPLER, }; + +#include "libavutil/ffversion.h" +const char swr_ffversion[] = "FFmpeg version " FFMPEG_VERSION; + unsigned swresample_version(void) { av_assert0(LIBSWRESAMPLE_VERSION_MICRO >= 100); |