From 982fad256ef10832f3dfc893b753ea189a05f2c3 Mon Sep 17 00:00:00 2001
From: spicyjpeg <thatspicyjpeg@gmail.com>
Date: Tue, 25 Feb 2025 18:54:53 +0100
Subject: [PATCH] Add .editorconfig, .gitignore and FFmpeg deprecation note

---
 .editorconfig       |  9 +++++++++
 .gitignore          |  6 ++++++
 meson.build         | 26 +++++++++++++-------------
 psxavenc/decoding.c |  1 +
 4 files changed, 29 insertions(+), 13 deletions(-)
 create mode 100644 .editorconfig
 create mode 100644 .gitignore

diff --git a/.editorconfig b/.editorconfig
new file mode 100644
index 0000000..4dd2432
--- /dev/null
+++ b/.editorconfig
@@ -0,0 +1,9 @@
+root = true
+
+[*]
+indent_style             = tab
+indent_size              = 4
+charset                  = utf-8
+end_of_line              = lf
+trim_trailing_whitespace = true
+insert_final_newline     = true
diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000..5feaf27
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,6 @@
+desktop.ini
+.DS_Store
+.vscode/
+build/
+.cache/
+*.code-workspace
diff --git a/meson.build b/meson.build
index 99b6249..c70759c 100644
--- a/meson.build
+++ b/meson.build
@@ -9,24 +9,24 @@ configure_file(output: 'config.h', configuration: conf_data)
 libm_dep = meson.get_compiler('c').find_library('m')
 
 ffmpeg = [
-  dependency('libavformat'),
-  dependency('libavcodec'),
-  dependency('libavutil'),
-  dependency('libswresample'),
-  dependency('libswscale')
+	dependency('libavformat'),
+	dependency('libavcodec'),
+	dependency('libavutil'),
+	dependency('libswresample'),
+	dependency('libswscale')
 ]
 
 libpsxav = static_library('psxav', [
-  'libpsxav/adpcm.c',
-  'libpsxav/cdrom.c',
-  'libpsxav/libpsxav.h'
+	'libpsxav/adpcm.c',
+	'libpsxav/cdrom.c',
+	'libpsxav/libpsxav.h'
 ])
 libpsxav_dep = declare_dependency(include_directories: include_directories('libpsxav'), link_with: libpsxav)
 
 executable('psxavenc', [
-  'psxavenc/cdrom.c',
-  'psxavenc/decoding.c',
-  'psxavenc/filefmt.c',
-  'psxavenc/mdec.c',
-  'psxavenc/psxavenc.c'
+	'psxavenc/cdrom.c',
+	'psxavenc/decoding.c',
+	'psxavenc/filefmt.c',
+	'psxavenc/mdec.c',
+	'psxavenc/psxavenc.c'
 ], dependencies: [libm_dep, ffmpeg, libpsxav_dep], install: true)
diff --git a/psxavenc/decoding.c b/psxavenc/decoding.c
index 99895ab..54a9124 100644
--- a/psxavenc/decoding.c
+++ b/psxavenc/decoding.c
@@ -399,6 +399,7 @@ void close_av_data(settings_t *settings)
 
 	av_frame_free(&(av->frame));
 	swr_free(&(av->resampler));
+	// Deprecated, kept for compatibility with older FFmpeg versions.
 	avcodec_close(av->audio_codec_context);
 	avcodec_free_context(&(av->audio_codec_context));
 	avformat_free_context(av->format);