diff options
| author | cloud11665 <cloud11665@gmail.com> | 2023-06-05 22:48:04 +0200 |
|---|---|---|
| committer | Dudemanguy <random342@airmail.cc> | 2023-07-01 02:05:23 +0000 |
| commit | b45be3d6e9d1796513f1f6214ceace8d8ef027ac (patch) | |
| tree | 18ba55b19034ede45799d16ce7ca637630a4d6a4 /test | |
| parent | 695172f63e9a8e440d41f50f08af89aa69c602e6 (diff) | |
| download | mpv-b45be3d6e9d1796513f1f6214ceace8d8ef027ac.tar.bz2 mpv-b45be3d6e9d1796513f1f6214ceace8d8ef027ac.tar.xz | |
test/meson: explicitly specify lavf dependency
Added stubs for mp_set_avdict().
Diffstat (limited to 'test')
| -rw-r--r-- | test/meson.build | 6 | ||||
| -rw-r--r-- | test/test_utils.c | 1 | ||||
| -rw-r--r-- | test/test_utils.h | 2 |
3 files changed, 6 insertions, 3 deletions
diff --git a/test/meson.build b/test/meson.build index f2ced866f1..4db93a11b9 100644 --- a/test/meson.build +++ b/test/meson.build @@ -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 diff --git a/test/test_utils.c b/test/test_utils.c index a1ecfacfd7..92f083ffbe 100644 --- a/test/test_utils.c +++ b/test/test_utils.c @@ -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) {}; diff --git a/test/test_utils.h b/test/test_utils.h index 7dcb32cc3b..b776dedf08 100644 --- a/test/test_utils.h +++ b/test/test_utils.h @@ -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 |