Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/videolan/dav1d.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJanne Grunau <janne-vlc@jannau.net>2019-02-06 02:32:56 +0300
committerJanne Grunau <janne-vlc@jannau.net>2019-02-13 23:41:22 +0300
commitd1c56da1d1c65767924d6752e802380409a38d17 (patch)
tree9f922a55eca97b619b6c7091e66b46c18d5e93f6 /tools/dav1d.c
parent8e80f57c112e21f757e09401f566c89d424a31d6 (diff)
build: generate a installed version header for semantic versioning
Renames the current version function and define to dav1d_version_vcs() and DAV1D_VERSION_VCS. Fixes #241. The generated version.h is included as "dav1d/version.h" to avoid errors with a stale include/version.h in a build dir.
Diffstat (limited to 'tools/dav1d.c')
-rw-r--r--tools/dav1d.c12
1 files changed, 6 insertions, 6 deletions
diff --git a/tools/dav1d.c b/tools/dav1d.c
index a76c8de..46997fb 100644
--- a/tools/dav1d.c
+++ b/tools/dav1d.c
@@ -26,7 +26,7 @@
*/
#include "config.h"
-#include "version.h"
+#include "vcs_version.h"
#include <assert.h>
#include <errno.h>
@@ -40,7 +40,7 @@
# include <io.h>
#endif
-#include "dav1d/data.h"
+#include "dav1d/dav1d.h"
#include "input/input.h"
@@ -73,11 +73,11 @@ int main(const int argc, char *const *const argv) {
Dav1dContext *c;
Dav1dData data;
unsigned n_out = 0, total, fps[2];
- const char *version = dav1d_version();
+ const char *version = dav1d_version_vcs();
- if (strcmp(version, DAV1D_VERSION)) {
+ if (strcmp(version, DAV1D_VERSION_VCS)) {
fprintf(stderr, "Version mismatch (library: %s, executable: %s)\n",
- version, DAV1D_VERSION);
+ version, DAV1D_VERSION_VCS);
return -1;
}
@@ -100,7 +100,7 @@ int main(const int argc, char *const *const argv) {
}
if (!cli_settings.quiet)
- fprintf(stderr, "dav1d %s - by VideoLAN\n", DAV1D_VERSION);
+ fprintf(stderr, "dav1d %s - by VideoLAN\n", dav1d_version_vcs());
// skip frames until a sequence header is found
if (cli_settings.skip) {