From e82a8957230240e423b698bbc89c6f4d6d92be1a Mon Sep 17 00:00:00 2001
From: Yannis Guyon <yguyon@google.com>
Date: Wed, 31 Jan 2024 14:22:53 +0100
Subject: [PATCH] Update the version to 1.0.4 (devel flag on)

---
 CHANGELOG.md        | 13 +++++++++++++
 CMakeLists.txt      |  4 ++--
 include/avif/avif.h |  2 +-
 3 files changed, 16 insertions(+), 3 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index a3880a4e5d..8bc2e70202 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -84,6 +84,18 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
   which each have an associated auxiliary alpha image item
   (https://crbug.com/oss-fuzz/65657).
 
+## [1.0.4] - 2024-02-08
+
+### Changed
+* AVIF_ENABLE_WERROR is set to OFF by default.
+* Fix wrong alpha plane deallocation when decoded tile pixel format does not
+  match reconstructed output image pixel format (b/320234262).
+* Fix identical chunk skipping optimization when writing animation data
+  (b/321189607 and b/321189607).
+* Fix ID selection for artificial grid alpha item when decoding a grid of tiles
+  which each have an associated auxiliary alpha image item
+  (https://crbug.com/oss-fuzz/65657).
+
 ## [1.0.3] - 2023-12-03
 
 ### Changed
@@ -1074,6 +1086,7 @@ code.
 - `avifVersion()` function
 
 [Unreleased]: https://github.com/AOMediaCodec/libavif/compare/v1.0.0...HEAD
+[1.0.4]: https://github.com/AOMediaCodec/libavif/compare/v1.0.3...v1.0.4
 [1.0.3]: https://github.com/AOMediaCodec/libavif/compare/v1.0.2...v1.0.3
 [1.0.2]: https://github.com/AOMediaCodec/libavif/compare/v1.0.1...v1.0.2
 [1.0.1]: https://github.com/AOMediaCodec/libavif/compare/v1.0.0...v1.0.1
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 9e41df1c66..598c18d766 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -14,7 +14,7 @@ set(AVIF_SOURCE_DIR "${CMAKE_CURRENT_SOURCE_DIR}")
 # Specify search path for CMake modules to be loaded by include() and find_package()
 list(APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/cmake/Modules")
 
-project(libavif LANGUAGES C VERSION 1.0.3)
+project(libavif LANGUAGES C VERSION 1.0.4)
 
 # Set C99 as the default
 set(CMAKE_C_STANDARD 99)
@@ -28,7 +28,7 @@ set(CMAKE_C_STANDARD 99)
 #     Increment PATCH.
 set(LIBRARY_VERSION_MAJOR 16)
 set(LIBRARY_VERSION_MINOR 0)
-set(LIBRARY_VERSION_PATCH 3)
+set(LIBRARY_VERSION_PATCH 4)
 set(LIBRARY_VERSION "${LIBRARY_VERSION_MAJOR}.${LIBRARY_VERSION_MINOR}.${LIBRARY_VERSION_PATCH}")
 set(LIBRARY_SOVERSION ${LIBRARY_VERSION_MAJOR})
 
diff --git a/include/avif/avif.h b/include/avif/avif.h
index e9cb1de68a..63d7077474 100644
--- a/include/avif/avif.h
+++ b/include/avif/avif.h
@@ -73,7 +73,7 @@ extern "C" {
 // to leverage in-development code without breaking their stable builds.
 #define AVIF_VERSION_MAJOR 1
 #define AVIF_VERSION_MINOR 0
-#define AVIF_VERSION_PATCH 3
+#define AVIF_VERSION_PATCH 4
 #define AVIF_VERSION_DEVEL 1
 #define AVIF_VERSION \
     ((AVIF_VERSION_MAJOR * 1000000) + (AVIF_VERSION_MINOR * 10000) + (AVIF_VERSION_PATCH * 100) + AVIF_VERSION_DEVEL)