Add .editorconfig, .gitignore and FFmpeg deprecation note
This commit is contained in:
parent
b6c8a1c7b6
commit
982fad256e
|
@ -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
|
|
@ -0,0 +1,6 @@
|
||||||
|
desktop.ini
|
||||||
|
.DS_Store
|
||||||
|
.vscode/
|
||||||
|
build/
|
||||||
|
.cache/
|
||||||
|
*.code-workspace
|
26
meson.build
26
meson.build
|
@ -9,24 +9,24 @@ configure_file(output: 'config.h', configuration: conf_data)
|
||||||
libm_dep = meson.get_compiler('c').find_library('m')
|
libm_dep = meson.get_compiler('c').find_library('m')
|
||||||
|
|
||||||
ffmpeg = [
|
ffmpeg = [
|
||||||
dependency('libavformat'),
|
dependency('libavformat'),
|
||||||
dependency('libavcodec'),
|
dependency('libavcodec'),
|
||||||
dependency('libavutil'),
|
dependency('libavutil'),
|
||||||
dependency('libswresample'),
|
dependency('libswresample'),
|
||||||
dependency('libswscale')
|
dependency('libswscale')
|
||||||
]
|
]
|
||||||
|
|
||||||
libpsxav = static_library('psxav', [
|
libpsxav = static_library('psxav', [
|
||||||
'libpsxav/adpcm.c',
|
'libpsxav/adpcm.c',
|
||||||
'libpsxav/cdrom.c',
|
'libpsxav/cdrom.c',
|
||||||
'libpsxav/libpsxav.h'
|
'libpsxav/libpsxav.h'
|
||||||
])
|
])
|
||||||
libpsxav_dep = declare_dependency(include_directories: include_directories('libpsxav'), link_with: libpsxav)
|
libpsxav_dep = declare_dependency(include_directories: include_directories('libpsxav'), link_with: libpsxav)
|
||||||
|
|
||||||
executable('psxavenc', [
|
executable('psxavenc', [
|
||||||
'psxavenc/cdrom.c',
|
'psxavenc/cdrom.c',
|
||||||
'psxavenc/decoding.c',
|
'psxavenc/decoding.c',
|
||||||
'psxavenc/filefmt.c',
|
'psxavenc/filefmt.c',
|
||||||
'psxavenc/mdec.c',
|
'psxavenc/mdec.c',
|
||||||
'psxavenc/psxavenc.c'
|
'psxavenc/psxavenc.c'
|
||||||
], dependencies: [libm_dep, ffmpeg, libpsxav_dep], install: true)
|
], dependencies: [libm_dep, ffmpeg, libpsxav_dep], install: true)
|
||||||
|
|
|
@ -399,6 +399,7 @@ void close_av_data(settings_t *settings)
|
||||||
|
|
||||||
av_frame_free(&(av->frame));
|
av_frame_free(&(av->frame));
|
||||||
swr_free(&(av->resampler));
|
swr_free(&(av->resampler));
|
||||||
|
// Deprecated, kept for compatibility with older FFmpeg versions.
|
||||||
avcodec_close(av->audio_codec_context);
|
avcodec_close(av->audio_codec_context);
|
||||||
avcodec_free_context(&(av->audio_codec_context));
|
avcodec_free_context(&(av->audio_codec_context));
|
||||||
avformat_free_context(av->format);
|
avformat_free_context(av->format);
|
||||||
|
|
Loading…
Reference in New Issue