github
/
mpv
mirror of https://github.com/mpv-player/mpv
1
Fork 0
Code Releases Activity

meson: include our local copy of libavutil uuid if ffmpeg is too old 

In the previous change, I added the uuid files. In this change, we
check the libavutil version and if it's too old, we compile in our
local copy.

We have to change the include paths of the uuid code to find some other
libavutil headers, but nothing beyond that.
This commit is contained in:
Philip Langdale 2023-09-03 10:26:04 -07:00 committed by Philip Langdale
parent 64bb9c092a
commit fb5273985c
2 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
meson.build
View File

@ -747,6 +747,11 @@ if features['uchardet']
dependencies += uchardet
endif
features += {'lavu-uuid': libavutil.version().version_compare('>= 57.27.100')}
if not features['lavu-uuid']
sources += files('misc/uuid.c')
endif
vapoursynth = dependency('vapoursynth', version: '>= 26', required: get_option('vapoursynth'))
vapoursynth_script = dependency('vapoursynth-script', version: '>= 26',
required: get_option('vapoursynth'))

4
misc/uuid.c
View File

@ -61,8 +61,8 @@
*/
#include "uuid.h"
#include "error.h"
#include "avstring.h"
#include "libavutil/error.h"
#include "libavutil/avstring.h"
int av_uuid_parse(const char *in, AVUUID uu)
{