test/meson: explicitly specify lavf dependency

Added stubs for mp_set_avdict().
This commit is contained in:
cloud11665 2023-06-05 22:48:04 +02:00 committed by Dudemanguy
parent 695172f63e
commit b45be3d6e9
3 changed files with 6 additions and 3 deletions

View File

@ -116,19 +116,19 @@ if libavutil.version().version_compare('>= 57.39.101')
scale_sws_objects = libmpv.extract_objects('video/image_writer.c',
'video/repack.c')
scale_sws = executable('scale-sws', ['scale_sws.c', 'scale_test.c'], include_directories: incdir,
objects: scale_sws_objects, dependencies: [libswscale, jpeg, zimg],
objects: scale_sws_objects, dependencies: [libavutil, libavformat, libswscale, jpeg, zimg],
link_with: [img_utils, test_utils])
test('scale-sws', scale_sws, args: [refdir, outdir], suite: 'ffmpeg')
if features['zimg']
repack_objects = libmpv.extract_objects('sub/draw_bmp.c')
repack = executable('repack', 'repack.c', include_directories: incdir, objects: repack_objects,
dependencies: [libswscale, zimg], link_with: [img_utils, test_utils])
dependencies: [libavutil, libswscale, zimg], link_with: [img_utils, test_utils])
test('repack', repack, args: [refdir, outdir], suite: 'ffmpeg')
scale_zimg_objects = libmpv.extract_objects('video/image_writer.c')
scale_zimg = executable('scale-zimg', ['scale_test.c', 'scale_zimg.c'], include_directories: incdir,
objects: scale_zimg_objects, dependencies:[libswscale, jpeg, zimg],
objects: scale_zimg_objects, dependencies:[libavutil, libavformat, libswscale, jpeg, zimg],
link_with: [img_utils, test_utils])
test('scale-zimg', scale_zimg, args: [refdir, outdir], suite: 'ffmpeg')
endif

View File

@ -105,6 +105,7 @@ void mp_msg(struct mp_log *log, int lev, const char *format, ...) {};
int mp_msg_find_level(const char *s) {return 0;};
int mp_msg_level(struct mp_log *log) {return 0;};
void mp_write_console_ansi(void) {};
void mp_set_avdict(AVDictionary **dict, char **kv) {};
#ifndef WIN32_TESTS
void mp_add_timeout(void) {};

View File

@ -52,6 +52,8 @@ void mp_msg(struct mp_log *log, int lev, const char *format, ...)
int mp_msg_find_level(const char *s);
int mp_msg_level(struct mp_log *log);
void mp_write_console_ansi(void);
typedef struct AVDictionary AVDictionary;
void mp_set_avdict(AVDictionary **dict, char **kv);
// Windows additionally requires timer related code so it will actually
// import the real versions of these functions and use them. On other