let dav1d_version() return the project version

Increments the soname revision number for this behavior change.
Removes the DAV1D_VERSION and DAV1D_VERSION_INT defines and
dav1d_version_vcs() and dav1d_version_int().
Also cleans up the version usage in dav1d CLI.
Refs #241, #255.

2 files changed, 5 insertions, 5 deletions

diff --git a/tools/dav1d.c b/tools/dav1d.c
index 46997fb..8edcb75 100644
--- a/tools/dav1d.c
+++ b/tools/dav1d.c
@@ -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_vcs();
+    const char *version = dav1d_version();
 
-    if (strcmp(version, DAV1D_VERSION_VCS)) {
+    if (strcmp(version, DAV1D_VERSION)) {
         fprintf(stderr, "Version mismatch (library: %s, executable: %s)\n",
-                version, DAV1D_VERSION_VCS);
+                version, DAV1D_VERSION);
         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_vcs());
+        fprintf(stderr, "dav1d %s - by VideoLAN\n", dav1d_version());
 
     // skip frames until a sequence header is found
     if (cli_settings.skip) {
diff --git a/tools/dav1d_cli_parse.c b/tools/dav1d_cli_parse.c
index 134535d..b364ca3 100644
--- a/tools/dav1d_cli_parse.c
+++ b/tools/dav1d_cli_parse.c
@@ -263,7 +263,7 @@ void parse(const int argc, char *const *const argv,
                 !!parse_unsigned(optarg, ARG_ALL_LAYERS, argv[0]);
             break;
         case 'v':
-            fprintf(stderr, "%s\n", dav1d_version_vcs());
+            fprintf(stderr, "%s\n", dav1d_version());
             exit(0);
         case ARG_CPU_MASK:
             dav1d_set_cpu_flags_mask(parse_enum(optarg, cpu_mask_tbl,