From 4bb94f13065cf2f68dc5874be86b62a6c3ef080d Mon Sep 17 00:00:00 2001 From: wm4 Date: Mon, 29 Feb 2016 20:59:20 +0100 Subject: command: export canonical ffmpeg version identifier Was printed only with "mpv -h" or so. --- DOCS/man/input.rst | 7 +++++++ player/command.c | 11 +++++++++++ 2 files changed, 18 insertions(+) diff --git a/DOCS/man/input.rst b/DOCS/man/input.rst index 726354eafa..6dcf7a83e4 100644 --- a/DOCS/man/input.rst +++ b/DOCS/man/input.rst @@ -2028,6 +2028,13 @@ Property list Return the configuration arguments which were passed to the build system (typically the way ``./waf configure ...`` was invoked). +``ffmpeg-version`` + Return the contents of the ``av_version_info()`` API call. This is a string + which identifies the build in some way, either through a release version + number, or a git hash. This applies to Libav as well (the property is + still named the same.) This property is unavailable if mpv is linked against + older FFmpeg and Libav versions. + ``options/`` (RW) Read-only access to value of option ``--``. Most options can be changed at runtime by writing to this property. Note that many options diff --git a/player/command.c b/player/command.c index f4a78e11fb..9dc46900f2 100644 --- a/player/command.c +++ b/player/command.c @@ -3333,6 +3333,16 @@ static int mp_property_configuration(void *ctx, struct m_property *prop, return m_property_strdup_ro(action, arg, CONFIGURATION); } +static int mp_property_ffmpeg(void *ctx, struct m_property *prop, + int action, void *arg) +{ +#if HAVE_AV_VERSION_INFO + return m_property_strdup_ro(action, arg, av_version_info()); +#else + return M_PROPERTY_UNAVAILABLE; +#endif +} + static int mp_property_alias(void *ctx, struct m_property *prop, int action, void *arg) { @@ -3742,6 +3752,7 @@ static const struct m_property mp_properties[] = { {"mpv-version", mp_property_version}, {"mpv-configuration", mp_property_configuration}, + {"ffmpeg-version", mp_property_ffmpeg}, {"options", mp_property_options}, {"file-local-options", mp_property_local_options}, -- cgit v1.2.3