libavif v0.6.0

Author: Joe Drago

ext/avif/CHANGELOG.md

@@ -5,9 +5,9 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
 ## [Unreleased]
+
+## [0.6.0] - 2020-03-09
 ### Added
-- Update default dav1d version to 0.6.0
-- Update default rav1e version to v0.3.1
 - `avifRGBImage` structure and associated routines (BREAKING CHANGE)
 - avifImage alphaRange support
 - Support pasp, clap, irot, imir metadata for encode/decode
@@ -19,6 +19,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 - Lots of minor cleanup in code/CMake (wantehchang)
 - Fix to NCLX color profile plumbing (ledyba-z)
 - Cleanup unnecessary avifBool ternary expressions
+- Update default dav1d version to 0.6.0
+- Update default rav1e version to v0.3.1
 
 ## [0.5.7] - 2020-03-03
 ### Added
@@ -325,7 +327,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 - Constants `AVIF_VERSION`, `AVIF_VERSION_MAJOR`, `AVIF_VERSION_MINOR`, `AVIF_VERSION_PATCH`
 - `avifVersion()` function
 
-[Unreleased]: https://github.com/AOMediaCodec/libavif/compare/v0.5.7...HEAD
+[Unreleased]: https://github.com/AOMediaCodec/libavif/compare/v0.6.0...HEAD
+[0.6.0]: https://github.com/AOMediaCodec/libavif/compare/v0.5.7...v0.6.0
 [0.5.7]: https://github.com/AOMediaCodec/libavif/compare/v0.5.6...v0.5.7
 [0.5.6]: https://github.com/AOMediaCodec/libavif/compare/v0.5.5...v0.5.6
 [0.5.5]: https://github.com/AOMediaCodec/libavif/compare/v0.5.4...v0.5.5

ext/avif/CMakeLists.txt

@@ -7,7 +7,7 @@ cmake_minimum_required(VERSION 3.5)
 # and find_package()
 list(APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/cmake/Modules")
 
-project(libavif LANGUAGES C CXX VERSION 0.5.7)
+project(libavif LANGUAGES C CXX VERSION 0.6.0)
 
 # SOVERSION scheme: CURRENT.AGE.REVISION
 #   If there was an incompatible interface change:
@@ -16,7 +16,7 @@ project(libavif LANGUAGES C CXX VERSION 0.5.7)
 #     Increment AGE. Set REVISION to 0
 #   If the source code was changed, but there were no interface changes:
 #     Increment REVISION.
-set(LIBRARY_VERSION "1.0.0")
+set(LIBRARY_VERSION "2.0.0")
 set(LIBRARY_SOVERSION "0")
 
 option(BUILD_SHARED_LIBS "Build shared avif library" ON)

ext/avif/apps/avifenc.c

@@ -17,7 +17,7 @@
     }                                                                 \
     arg = argv[++argIndex]
 
-static int syntax(void)
+static void syntax(void)
 {
     printf("Syntax: avifenc [options] input.y4m output.avif\n");
     printf("Options:\n");
@@ -52,7 +52,6 @@ static int syntax(void)
     printf("    --imir AXIS                       : Add imir property (mirroring). 0=vertical, 1=horizontal\n");
     printf("\n");
     avifPrintVersions();
-    return 0;
 }
 
 // This is *very* arbitrary, I just want to set people's expectations a bit
@@ -129,7 +128,8 @@ int main(int argc, char * argv[])
     const char * outputFilename = NULL;
 
     if (argc < 2) {
-        return syntax();
+        syntax();
+        return 1;
     }
 
     int jobs = 1;
@@ -156,7 +156,8 @@ int main(int argc, char * argv[])
         const char * arg = argv[argIndex];
 
         if (!strcmp(arg, "-h") || !strcmp(arg, "--help")) {
-            return syntax();
+            syntax();
+            return 0;
         } else if (!strcmp(arg, "-j") || !strcmp(arg, "--jobs")) {
             NEXTARG();
             jobs = atoi(arg);
@@ -263,6 +264,7 @@ int main(int argc, char * argv[])
                 outputFilename = arg;
             } else {
                 fprintf(stderr, "Too many positional arguments: %s\n", arg);
+                syntax();
                 return 1;
             }
         }
@@ -271,7 +273,8 @@ int main(int argc, char * argv[])
     }
 
     if (!inputFilename || !outputFilename) {
-        return syntax();
+        syntax();
+        return 1;
     }
 
     int returnCode = 0;

ext/avif/ext/dav1d.cmd

@@ -8,7 +8,7 @@
 : # If you're running this on Windows, be sure you've already run this (from your VC2017 install dir):
 : #     "C:\Program Files (x86)\Microsoft Visual Studio\2017\Professional\VC\Auxiliary\Build\vcvars64.bat"
 
-git clone -b 0.5.2 --depth 1 https://code.videolan.org/videolan/dav1d.git
+git clone -b 0.6.0 --depth 1 https://code.videolan.org/videolan/dav1d.git
 
 cd dav1d
 mkdir build

ext/avif/ext/rav1e.cmd

@@ -11,7 +11,7 @@
 : # Also, the error that "The target windows-msvc is not supported yet" can safely be ignored provided that rav1e/target/release
 : # contains rav1e.h and rav1e.lib.
 
-git clone -b v0.3.0 --depth 1 https://github.com/xiph/rav1e.git
+git clone -b v0.3.1 --depth 1 https://github.com/xiph/rav1e.git
 
 cd rav1e
 cargo install cbindgen

ext/avif/include/avif/avif.h

@@ -15,8 +15,8 @@ extern "C" {
 // Constants
 
 #define AVIF_VERSION_MAJOR 0
-#define AVIF_VERSION_MINOR 5
-#define AVIF_VERSION_PATCH 7
+#define AVIF_VERSION_MINOR 6
+#define AVIF_VERSION_PATCH 0
 #define AVIF_VERSION (AVIF_VERSION_MAJOR * 10000) + (AVIF_VERSION_MINOR * 100) + AVIF_VERSION_PATCH
 
 typedef int avifBool;