From 4a817abe70c715ac409e89471b16b66074591557 Mon Sep 17 00:00:00 2001
From: Dirk Farin <dirk.farin@gmail.com>
Date: Tue, 10 Oct 2023 12:38:52 +0200
Subject: [PATCH] rename ffmpeg plugin to simply 'ffmpeg_dec' as we can extend
 it in the future to also handle other codecs

---
 CMakeLists.txt                                              | 6 +++---
 CMakePresets.json                                           | 6 +++---
 libheif/plugins/CMakeLists.txt                              | 6 +++---
 .../plugins/{decoder_ffmpeg_hevc.cc => decoder_ffmpeg.cc}   | 2 +-
 libheif/plugins/{decoder_ffmpeg_hevc.h => decoder_ffmpeg.h} | 0
 5 files changed, 10 insertions(+), 10 deletions(-)
 rename libheif/plugins/{decoder_ffmpeg_hevc.cc => decoder_ffmpeg.cc} (99%)
 rename libheif/plugins/{decoder_ffmpeg_hevc.h => decoder_ffmpeg.h} (100%)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 57913fcd95..1adcea398f 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -166,8 +166,8 @@ endif()
 
 # ffmpeg
 
-plugin_option(FFMPEG_HEVC_DECODER "FFMPEG HEVC decoder (HW accelerated)" OFF OFF)
-if (WITH_FFMPEG_HEVC_DECODER)
+plugin_option(FFMPEG_DECODER "FFMPEG HEVC decoder (HW accelerated)" OFF OFF)
+if (WITH_FFMPEG_DECODER)
     find_package(FFMPEG COMPONENTS avcodec)
 endif ()
 
@@ -180,7 +180,7 @@ option(WITH_UNCOMPRESSED_CODEC " Support internal ISO/IEC 23001-17 uncompressed
 
 message("=== Summary of compiled codecs ===")
 plugin_compilation_info(LIBDE265 LIBDE265 "libde265 HEVC decoder")
-plugin_compilation_info(FFMPEG_HEVC_DECODER FFMPEG_avcodec "FFMPEG HEVC decoder (HW acc)")
+plugin_compilation_info(FFMPEG_DECODER FFMPEG_avcodec "FFMPEG HEVC decoder (HW acc)")
 plugin_compilation_info(X265 X265 "x265 HEVC encoder")
 plugin_compilation_info(KVAZAAR KVAZAAR "Kvazaar HEVC encoder")
 plugin_compilation_info(AOM_DECODER AOM "AOM AV1 decoder")
diff --git a/CMakePresets.json b/CMakePresets.json
index 0198ec4209..1d8448e412 100644
--- a/CMakePresets.json
+++ b/CMakePresets.json
@@ -36,8 +36,8 @@
 	"WITH_OpenJPEG_DECODER_PLUGIN" : "ON",
 	"WITH_OpenJPEG_ENCODER" : "ON",
 	"WITH_OpenJPEG_ENCODER_PLUGIN" : "ON",
-	"WITH_FFMPEG_HEVC_DECODER" : "ON",
-	"WITH_FFMPEG_HEVC_DECODER_PLUGIN" : "ON"
+	"WITH_FFMPEG_DECODER" : "ON",
+	"WITH_FFMPEG_DECODER_PLUGIN" : "ON"
       }
     },
     {
@@ -101,7 +101,7 @@
 	"WITH_KVAZAAR" : "OFF",
 	"WITH_OpenJPEG_DECODER" : "OFF",
 	"WITH_OpenJPEG_ENCODER" : "OFF",
-	"WITH_FFMPEG_HEVC_DECODER" : "OFF"
+	"WITH_FFMPEG_DECODER" : "OFF"
       }
     },
     {
diff --git a/libheif/plugins/CMakeLists.txt b/libheif/plugins/CMakeLists.txt
index 210e2187a7..6ccdaac5e3 100644
--- a/libheif/plugins/CMakeLists.txt
+++ b/libheif/plugins/CMakeLists.txt
@@ -87,9 +87,9 @@ set(KVAZAAR_sources encoder_kvazaar.cc encoder_kvazaar.h)
 set(KVAZAAR_extra_plugin_sources)
 plugin_compilation(kvazaar KVAZAAR KVAZAAR KVAZAAR)
 
-set(FFMPEG_HEVC_DECODER_sources decoder_ffmpeg_hevc.cc decoder_ffmpeg_hevc.h)
-set(FFMPEG_HEVC_DECODER_extra_plugin_sources ../error.cc)
-plugin_compilation(ffmpeg_hevc_dec FFMPEG FFMPEG_HEVC_DECODER FFMPEG_HEVC_DECODER)
+set(FFMPEG_DECODER_sources decoder_ffmpeg.cc decoder_ffmpeg.h)
+set(FFMPEG_DECODER_extra_plugin_sources ../error.cc)
+plugin_compilation(ffmpeg_dec FFMPEG FFMPEG_DECODER FFMPEG_DECODER)
 
 target_sources(heif PRIVATE
                encoder_mask.h
diff --git a/libheif/plugins/decoder_ffmpeg_hevc.cc b/libheif/plugins/decoder_ffmpeg.cc
similarity index 99%
rename from libheif/plugins/decoder_ffmpeg_hevc.cc
rename to libheif/plugins/decoder_ffmpeg.cc
index 78bbb273a8..f836fa5612 100644
--- a/libheif/plugins/decoder_ffmpeg_hevc.cc
+++ b/libheif/plugins/decoder_ffmpeg.cc
@@ -20,7 +20,7 @@
 
 #include "libheif/heif.h"
 #include "libheif/heif_plugin.h"
-#include "decoder_ffmpeg_hevc.h"
+#include "decoder_ffmpeg.h"
 
 #if defined(HAVE_CONFIG_H)
 #include "config.h"
diff --git a/libheif/plugins/decoder_ffmpeg_hevc.h b/libheif/plugins/decoder_ffmpeg.h
similarity index 100%
rename from libheif/plugins/decoder_ffmpeg_hevc.h
rename to libheif/plugins/decoder_ffmpeg.h