diff --git a/Changelog b/Changelog
index 0991b3dc5b..c697a44a81 100644
--- a/Changelog
+++ b/Changelog
@@ -1,3 +1,9 @@
+# 24/04/2023: GPAC 2.2.1
+
+## Security
+- Backport of various CVE fixes
+
+
# 19/12/2022: GPAC 2.2
## Media Formats
diff --git a/README.md b/README.md
index b37ba12eee..6bea932579 100644
--- a/README.md
+++ b/README.md
@@ -25,7 +25,7 @@
# GPAC Introduction
-Latest Release: 2.2
+Latest Release: 2.2.1
GPAC is an open-source multimedia framework focused on modularity and standards compliance.
GPAC provides tools to process, inspect, package, stream, playback and interact with media content. Such content can be any combination of audio, video, subtitles, metadata, scalable graphics, encrypted media, 2D/3D graphics and ECMAScript.
@@ -118,4 +118,3 @@ Targets:
- [ ] DASH event support
- [ ] Better TTML2 / SMPTE ST 2052-1 support
- [ ] GUI cleanup ?
-
diff --git a/applications/gpac/ios-Info.plist b/applications/gpac/ios-Info.plist
index 6909bc44f6..a02cad9576 100644
--- a/applications/gpac/ios-Info.plist
+++ b/applications/gpac/ios-Info.plist
@@ -37,11 +37,11 @@
CFBundlePackageType
APPL
CFBundleShortVersionString
- 2.2
+ 2.2.1
CFBundleSignature
gpac
CFBundleVersion
- 12.10.0
+ 12.10.1
NSCameraUsageDescription
GPAC needs camera access to handle this URL
NSMicrophoneUsageDescription
diff --git a/debian/changelog b/debian/changelog
index d024c00563..4e90cf7636 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-gpac (2.2) stable; urgency=low
+gpac (2.2.1) stable; urgency=low
* Initial release - see https://github.com/gpac/gpac/releases for more details
diff --git a/debian/control b/debian/control
index ea502ce989..fe91c0aa22 100644
--- a/debian/control
+++ b/debian/control
@@ -23,11 +23,10 @@ Package: libgpac-dev
Architecture: any
Section: libdevel
Depends: gpac
-Replaces: gpac (<= 2.0.0)
+Replaces: gpac (<= 2.2.0)
Description: Framework for production, encoding, delivery and interactive playback of multimedia content
GPAC supports many AV codecs, multimedia containers (MP4,fMP4, TS, avi, mov, mpg, mkv ...), complex
presentation formats (MPEG-4 Systems, SVG Tiny 1.2, VRML/X3D) and subtitles (SRT, WebVTT, TTXT/TX3G, TTML).
Supported inputs and outputs are pipes, UDP/TCP/UN sockets, local files, HTTP, DASH/HLS, RTP/RTSP, MPEG-2 TS,
ATSC 3.0 ROUTE sessions, desktop grabbing, camera/microphone inputs and any input format supported by FFmpeg.
GPAC features a highly configurable media processing pipeline extensible through JavaScript, and can be embedded in Python or NodeJS applications.
-
diff --git a/gpac.spec b/gpac.spec
index f522c37bee..33dbcc697c 100644
--- a/gpac.spec
+++ b/gpac.spec
@@ -1,11 +1,11 @@
# $Id: gpac.spec,v 1.5 2008-12-02 18:04:42 jeanlf Exp $
Summary: Framework for production, encoding, delivery and interactive playback of multimedia content
Name: gpac
-Version: 2.2
-Release: 2.2
+Version: 2.2.1
+Release: 2.2.1
License: LGPL
Group: Applications/Multimedia
-Source0: gpac-2.2.tar.gz
+Source0: gpac-2.2.1.tar.gz
URL: http://gpac.io/
BuildRoot: %{_tmppath}/%{name}-root
Requires: SDL
diff --git a/include/gpac/version.h b/include/gpac/version.h
index 32371e46e2..4810033ef0 100644
--- a/include/gpac/version.h
+++ b/include/gpac/version.h
@@ -42,7 +42,7 @@
* SONAME versions must be digits (not strings)
*/
/*! Macro giving GPAC version name expressed as a printable string*/
-#define GPAC_VERSION "2.2"
+#define GPAC_VERSION "2.2.1"
// WARNING: when bumping, reflect the changes in share/python/libgpac.py !!
/*! ABI Major number of libgpac */
@@ -50,7 +50,7 @@
/*! ABI Minor number of libgpac */
#define GPAC_VERSION_MINOR 10
/*! ABI Micro number of libgpac */
-#define GPAC_VERSION_MICRO 0
+#define GPAC_VERSION_MICRO 1
/*! gets GPAC full version including GIT revision
\return GPAC full version
diff --git a/packagers/osx/GPAC.app/Contents/Info.plist b/packagers/osx/GPAC.app/Contents/Info.plist
index 7c11ec61f9..db98fbfcad 100644
--- a/packagers/osx/GPAC.app/Contents/Info.plist
+++ b/packagers/osx/GPAC.app/Contents/Info.plist
@@ -516,7 +516,7 @@
yes
CFBundleShortVersionString
- 2.2
+ 2.2.1
CFBundleSignature
gpac
CFBundleURLTypes
@@ -567,7 +567,7 @@
NSMicrophoneUsageDescription
GPAC needs microphone access to handle this URL
CFBundleVersion
- 12.10.0
+ 12.10.1
LSMinimumSystemVersion
10.5.0
NSMainNibFile
diff --git a/packagers/win32_64/nsis/gpac_installer.nsi b/packagers/win32_64/nsis/gpac_installer.nsi
index 4bee694c34..feeadcf237 100644
--- a/packagers/win32_64/nsis/gpac_installer.nsi
+++ b/packagers/win32_64/nsis/gpac_installer.nsi
@@ -1,6 +1,6 @@
;--------------------------------
;General
-!define GPAC_VERSION 2.2
+!define GPAC_VERSION 2.2.1
!include default.out
!define GPAC_ROOT ..\..\..