diff --git a/CVE-2024-7055.patch b/CVE-2024-7055.patch
deleted file mode 100644
index 84dda1441b91698b53690e75d7f7b244dce0e0ba..0000000000000000000000000000000000000000
--- a/CVE-2024-7055.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-From d911cb96e55228619a29704dda26d2fddd6779f6 Mon Sep 17 00:00:00 2001
-From: Michael Niedermayer <michael@niedermayer.cc>
-Date: Tue, 27 Aug 2024 10:14:04 +0800
-Subject: [PATCH] avcodec/pnmdec: Use 64bit for input size check
-
----
- libavcodec/pnmdec.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/libavcodec/pnmdec.c b/libavcodec/pnmdec.c
-index acd77ea..40cc2ae 100644
---- a/libavcodec/pnmdec.c
-+++ b/libavcodec/pnmdec.c
-@@ -264,7 +264,7 @@ static int pnm_decode_frame(AVCodecContext *avctx, AVFrame *p,
-         break;
-     case AV_PIX_FMT_GBRPF32:
-         if (!s->half) {
--            if (avctx->width * avctx->height * 12 > s->bytestream_end - s->bytestream)
-+            if (avctx->width * avctx->height * 12LL > s->bytestream_end - s->bytestream)
-                 return AVERROR_INVALIDDATA;
-             scale = 1.f / s->scale;
-             if (s->endian) {
--- 
-2.27.0
-
diff --git a/ffmpeg-6.1.1.tar.xz b/ffmpeg-6.1.2.tar.xz
similarity index 56%
rename from ffmpeg-6.1.1.tar.xz
rename to ffmpeg-6.1.2.tar.xz
index 3c4a2a241e2ac2b89b177463ec634af90e130612..1d36c660d0a7de55f8c3fd8ce5fa5cf69d546431 100644
Binary files a/ffmpeg-6.1.1.tar.xz and b/ffmpeg-6.1.2.tar.xz differ
diff --git a/ffmpeg.spec b/ffmpeg.spec
index f5aaf7f778c4613e47abcc24f893bd9ba85d7e58..1340a4b3e37608205f81190fd75406a18b4874d5 100644
--- a/ffmpeg.spec
+++ b/ffmpeg.spec
@@ -61,8 +61,8 @@
 
 Summary:        Digital VCR and streaming server
 Name:           ffmpeg%{?flavor}
-Version:        6.1.1
-Release:        14
+Version:        6.1.2
+Release:        1
 License:        GPL-3.0-or-later
 URL:            http://ffmpeg.org/
 Source0:        http://ffmpeg.org/releases/ffmpeg-%{version}.tar.xz
@@ -75,9 +75,7 @@ Patch4:		fix-CVE-2024-31582.patch
 Patch5:         fix_libsvgdec_compile_error.patch
 Patch6:         CVE-2023-49528.patch
 Patch7:         fix-CVE-2023-49502.patch
-Patch8:         fix-CVE-2024-32230.patch
-Patch9:         CVE-2024-7055.patch
-Patch10:        CVE-2023-49501.patch
+Patch8:         CVE-2023-49501.patch
 
 Requires:       %{name}-libs%{?_isa} = %{version}-%{release}
 %{?_with_cuda:BuildRequires: cuda-minimal-build-%{_cuda_version_rpm} cuda-drivers-devel}
@@ -407,6 +405,9 @@ install -pm755 tools/qt-faststart %{buildroot}%{_bindir}
 
 
 %changelog
+* Thu Sep 19 2024 jchzhou <zhoujiacheng@iscas.ac.cn> - 6.1.2-1
+- Upgrade to 6.1.2, remove obsolete patches
+
 * Wed Sep 18 2024 happyworker <208suo@208suo.com> - 6.1.1-14
 - CVE-2023-49501.patch
 
diff --git a/fix-CVE-2024-32230.patch b/fix-CVE-2024-32230.patch
deleted file mode 100644
index 7ccac228cea3248939eea404e16d05cecc8beccb..0000000000000000000000000000000000000000
--- a/fix-CVE-2024-32230.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-From 96449cfeaeb95fcfd7a2b8d9ccf7719e97471ed1 Mon Sep 17 00:00:00 2001
-From: Michael Niedermayer <michael@niedermayer.cc>
-Date: Mon, 8 Apr 2024 18:38:42 +0200
-Subject: [PATCH] avcodec/mpegvideo_enc: Fix 1 line and one column images
-
-Fixes: Ticket10952
-Fixes: poc21ffmpeg
-Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
----
- libavcodec/mpegvideo_enc.c | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/libavcodec/mpegvideo_enc.c b/libavcodec/mpegvideo_enc.c
-index 0e3255c0fb..2a75973ac4 100644
---- a/libavcodec/mpegvideo_enc.c
-+++ b/libavcodec/mpegvideo_enc.c
-@@ -1198,8 +1198,8 @@ static int load_input_picture(MpegEncContext *s, const AVFrame *pic_arg)
-                 int dst_stride = i ? s->uvlinesize : s->linesize;
-                 int h_shift = i ? s->chroma_x_shift : 0;
-                 int v_shift = i ? s->chroma_y_shift : 0;
--                int w = s->width  >> h_shift;
--                int h = s->height >> v_shift;
-+                int w = AV_CEIL_RSHIFT(s->width , h_shift);
-+                int h = AV_CEIL_RSHIFT(s->height, v_shift);
-                 const uint8_t *src = pic_arg->data[i];
-                 uint8_t *dst = pic->f->data[i];
-                 int vpad = 16;
--- 
-2.33.0
-