From 086e33dd6e7047da3af092fd3c322e8c63b86571 Mon Sep 17 00:00:00 2001 From: Mitchell Goff Date: Tue, 16 Sep 2025 14:25:18 -0700 Subject: [PATCH] Revert "minimal ffmpeg build (#36138)" This reverts commit 347b23055d03e3af878d7abbd04ca3296f5c1cc2. --- .gitattributes | 1 - SConstruct | 4 - system/loggerd/SConscript | 4 +- system/loggerd/tests/test_loggerd.py | 14 +--- third_party/.gitignore | 2 - third_party/ffmpeg/Darwin/lib/libavcodec.a | 3 - third_party/ffmpeg/Darwin/lib/libavformat.a | 3 - third_party/ffmpeg/Darwin/lib/libavutil.a | 3 - third_party/ffmpeg/Darwin/lib/libx264.a | 3 - third_party/ffmpeg/build.sh | 83 ------------------- .../ffmpeg/include/libavcodec/ac3_parser.h | 3 - .../ffmpeg/include/libavcodec/adts_parser.h | 3 - .../ffmpeg/include/libavcodec/avcodec.h | 3 - third_party/ffmpeg/include/libavcodec/avdct.h | 3 - third_party/ffmpeg/include/libavcodec/avfft.h | 3 - third_party/ffmpeg/include/libavcodec/bsf.h | 3 - third_party/ffmpeg/include/libavcodec/codec.h | 3 - .../ffmpeg/include/libavcodec/codec_desc.h | 3 - .../ffmpeg/include/libavcodec/codec_id.h | 3 - .../ffmpeg/include/libavcodec/codec_par.h | 3 - .../ffmpeg/include/libavcodec/d3d11va.h | 3 - third_party/ffmpeg/include/libavcodec/defs.h | 3 - third_party/ffmpeg/include/libavcodec/dirac.h | 3 - .../ffmpeg/include/libavcodec/dv_profile.h | 3 - third_party/ffmpeg/include/libavcodec/dxva2.h | 3 - third_party/ffmpeg/include/libavcodec/jni.h | 3 - .../ffmpeg/include/libavcodec/mediacodec.h | 3 - .../ffmpeg/include/libavcodec/packet.h | 3 - third_party/ffmpeg/include/libavcodec/qsv.h | 3 - third_party/ffmpeg/include/libavcodec/vdpau.h | 3 - .../ffmpeg/include/libavcodec/version.h | 3 - .../ffmpeg/include/libavcodec/version_major.h | 3 - .../ffmpeg/include/libavcodec/videotoolbox.h | 3 - .../ffmpeg/include/libavcodec/vorbis_parser.h | 3 - third_party/ffmpeg/include/libavcodec/xvmc.h | 3 - .../ffmpeg/include/libavformat/avformat.h | 3 - third_party/ffmpeg/include/libavformat/avio.h | 3 - .../ffmpeg/include/libavformat/version.h | 3 - .../include/libavformat/version_major.h | 3 - .../ffmpeg/include/libavutil/adler32.h | 3 - third_party/ffmpeg/include/libavutil/aes.h | 3 - .../ffmpeg/include/libavutil/aes_ctr.h | 3 - .../libavutil/ambient_viewing_environment.h | 3 - .../ffmpeg/include/libavutil/attributes.h | 3 - .../ffmpeg/include/libavutil/audio_fifo.h | 3 - .../ffmpeg/include/libavutil/avassert.h | 3 - .../ffmpeg/include/libavutil/avconfig.h | 3 - .../ffmpeg/include/libavutil/avstring.h | 3 - third_party/ffmpeg/include/libavutil/avutil.h | 3 - third_party/ffmpeg/include/libavutil/base64.h | 3 - .../ffmpeg/include/libavutil/blowfish.h | 3 - third_party/ffmpeg/include/libavutil/bprint.h | 3 - third_party/ffmpeg/include/libavutil/bswap.h | 3 - third_party/ffmpeg/include/libavutil/buffer.h | 3 - .../ffmpeg/include/libavutil/camellia.h | 3 - third_party/ffmpeg/include/libavutil/cast5.h | 3 - .../ffmpeg/include/libavutil/channel_layout.h | 3 - third_party/ffmpeg/include/libavutil/common.h | 3 - third_party/ffmpeg/include/libavutil/cpu.h | 3 - third_party/ffmpeg/include/libavutil/crc.h | 3 - third_party/ffmpeg/include/libavutil/csp.h | 3 - third_party/ffmpeg/include/libavutil/des.h | 3 - .../ffmpeg/include/libavutil/detection_bbox.h | 3 - third_party/ffmpeg/include/libavutil/dict.h | 3 - .../ffmpeg/include/libavutil/display.h | 3 - .../ffmpeg/include/libavutil/dovi_meta.h | 3 - .../ffmpeg/include/libavutil/downmix_info.h | 3 - .../include/libavutil/encryption_info.h | 3 - third_party/ffmpeg/include/libavutil/error.h | 3 - third_party/ffmpeg/include/libavutil/eval.h | 3 - .../ffmpeg/include/libavutil/executor.h | 3 - .../ffmpeg/include/libavutil/ffversion.h | 3 - third_party/ffmpeg/include/libavutil/fifo.h | 3 - third_party/ffmpeg/include/libavutil/file.h | 3 - .../include/libavutil/film_grain_params.h | 3 - third_party/ffmpeg/include/libavutil/frame.h | 3 - third_party/ffmpeg/include/libavutil/hash.h | 3 - .../include/libavutil/hdr_dynamic_metadata.h | 3 - .../libavutil/hdr_dynamic_vivid_metadata.h | 3 - third_party/ffmpeg/include/libavutil/hmac.h | 3 - .../ffmpeg/include/libavutil/hwcontext.h | 3 - .../ffmpeg/include/libavutil/hwcontext_cuda.h | 3 - .../include/libavutil/hwcontext_d3d11va.h | 3 - .../ffmpeg/include/libavutil/hwcontext_drm.h | 3 - .../include/libavutil/hwcontext_dxva2.h | 3 - .../include/libavutil/hwcontext_mediacodec.h | 3 - .../include/libavutil/hwcontext_opencl.h | 3 - .../ffmpeg/include/libavutil/hwcontext_qsv.h | 3 - .../include/libavutil/hwcontext_vaapi.h | 3 - .../include/libavutil/hwcontext_vdpau.h | 3 - .../libavutil/hwcontext_videotoolbox.h | 3 - .../include/libavutil/hwcontext_vulkan.h | 3 - .../ffmpeg/include/libavutil/imgutils.h | 3 - .../ffmpeg/include/libavutil/intfloat.h | 3 - .../ffmpeg/include/libavutil/intreadwrite.h | 3 - third_party/ffmpeg/include/libavutil/lfg.h | 3 - third_party/ffmpeg/include/libavutil/log.h | 3 - third_party/ffmpeg/include/libavutil/lzo.h | 3 - third_party/ffmpeg/include/libavutil/macros.h | 3 - .../libavutil/mastering_display_metadata.h | 3 - .../ffmpeg/include/libavutil/mathematics.h | 3 - third_party/ffmpeg/include/libavutil/md5.h | 3 - third_party/ffmpeg/include/libavutil/mem.h | 3 - .../ffmpeg/include/libavutil/motion_vector.h | 3 - .../ffmpeg/include/libavutil/murmur3.h | 3 - third_party/ffmpeg/include/libavutil/opt.h | 3 - .../ffmpeg/include/libavutil/parseutils.h | 3 - .../ffmpeg/include/libavutil/pixdesc.h | 3 - .../ffmpeg/include/libavutil/pixelutils.h | 3 - third_party/ffmpeg/include/libavutil/pixfmt.h | 3 - .../ffmpeg/include/libavutil/random_seed.h | 3 - .../ffmpeg/include/libavutil/rational.h | 3 - third_party/ffmpeg/include/libavutil/rc4.h | 3 - .../ffmpeg/include/libavutil/replaygain.h | 3 - third_party/ffmpeg/include/libavutil/ripemd.h | 3 - .../ffmpeg/include/libavutil/samplefmt.h | 3 - third_party/ffmpeg/include/libavutil/sha.h | 3 - third_party/ffmpeg/include/libavutil/sha512.h | 3 - .../ffmpeg/include/libavutil/spherical.h | 3 - .../ffmpeg/include/libavutil/stereo3d.h | 3 - third_party/ffmpeg/include/libavutil/tea.h | 3 - .../ffmpeg/include/libavutil/threadmessage.h | 3 - third_party/ffmpeg/include/libavutil/time.h | 3 - .../ffmpeg/include/libavutil/timecode.h | 3 - .../ffmpeg/include/libavutil/timestamp.h | 3 - third_party/ffmpeg/include/libavutil/tree.h | 3 - .../ffmpeg/include/libavutil/twofish.h | 3 - third_party/ffmpeg/include/libavutil/tx.h | 3 - third_party/ffmpeg/include/libavutil/uuid.h | 3 - .../ffmpeg/include/libavutil/version.h | 3 - .../include/libavutil/video_enc_params.h | 3 - .../ffmpeg/include/libavutil/video_hint.h | 3 - third_party/ffmpeg/include/libavutil/xtea.h | 3 - third_party/ffmpeg/include/x264.h | 3 - third_party/ffmpeg/include/x264_config.h | 3 - third_party/ffmpeg/larch64/lib/libavcodec.a | 3 - third_party/ffmpeg/larch64/lib/libavformat.a | 3 - third_party/ffmpeg/larch64/lib/libavutil.a | 3 - third_party/ffmpeg/larch64/lib/libx264.a | 3 - third_party/ffmpeg/x86_64/lib/libavcodec.a | 3 - third_party/ffmpeg/x86_64/lib/libavformat.a | 3 - third_party/ffmpeg/x86_64/lib/libavutil.a | 3 - third_party/ffmpeg/x86_64/lib/libx264.a | 3 - tools/cabana/SConscript | 2 +- tools/install_ubuntu_dependencies.sh | 6 ++ tools/mac_setup.sh | 1 + tools/replay/SConscript | 2 +- 147 files changed, 13 insertions(+), 517 deletions(-) delete mode 100644 third_party/ffmpeg/Darwin/lib/libavcodec.a delete mode 100644 third_party/ffmpeg/Darwin/lib/libavformat.a delete mode 100644 third_party/ffmpeg/Darwin/lib/libavutil.a delete mode 100644 third_party/ffmpeg/Darwin/lib/libx264.a delete mode 100755 third_party/ffmpeg/build.sh delete mode 100644 third_party/ffmpeg/include/libavcodec/ac3_parser.h delete mode 100644 third_party/ffmpeg/include/libavcodec/adts_parser.h delete mode 100644 third_party/ffmpeg/include/libavcodec/avcodec.h delete mode 100644 third_party/ffmpeg/include/libavcodec/avdct.h delete mode 100644 third_party/ffmpeg/include/libavcodec/avfft.h delete mode 100644 third_party/ffmpeg/include/libavcodec/bsf.h delete mode 100644 third_party/ffmpeg/include/libavcodec/codec.h delete mode 100644 third_party/ffmpeg/include/libavcodec/codec_desc.h delete mode 100644 third_party/ffmpeg/include/libavcodec/codec_id.h delete mode 100644 third_party/ffmpeg/include/libavcodec/codec_par.h delete mode 100644 third_party/ffmpeg/include/libavcodec/d3d11va.h delete mode 100644 third_party/ffmpeg/include/libavcodec/defs.h delete mode 100644 third_party/ffmpeg/include/libavcodec/dirac.h delete mode 100644 third_party/ffmpeg/include/libavcodec/dv_profile.h delete mode 100644 third_party/ffmpeg/include/libavcodec/dxva2.h delete mode 100644 third_party/ffmpeg/include/libavcodec/jni.h delete mode 100644 third_party/ffmpeg/include/libavcodec/mediacodec.h delete mode 100644 third_party/ffmpeg/include/libavcodec/packet.h delete mode 100644 third_party/ffmpeg/include/libavcodec/qsv.h delete mode 100644 third_party/ffmpeg/include/libavcodec/vdpau.h delete mode 100644 third_party/ffmpeg/include/libavcodec/version.h delete mode 100644 third_party/ffmpeg/include/libavcodec/version_major.h delete mode 100644 third_party/ffmpeg/include/libavcodec/videotoolbox.h delete mode 100644 third_party/ffmpeg/include/libavcodec/vorbis_parser.h delete mode 100644 third_party/ffmpeg/include/libavcodec/xvmc.h delete mode 100644 third_party/ffmpeg/include/libavformat/avformat.h delete mode 100644 third_party/ffmpeg/include/libavformat/avio.h delete mode 100644 third_party/ffmpeg/include/libavformat/version.h delete mode 100644 third_party/ffmpeg/include/libavformat/version_major.h delete mode 100644 third_party/ffmpeg/include/libavutil/adler32.h delete mode 100644 third_party/ffmpeg/include/libavutil/aes.h delete mode 100644 third_party/ffmpeg/include/libavutil/aes_ctr.h delete mode 100644 third_party/ffmpeg/include/libavutil/ambient_viewing_environment.h delete mode 100644 third_party/ffmpeg/include/libavutil/attributes.h delete mode 100644 third_party/ffmpeg/include/libavutil/audio_fifo.h delete mode 100644 third_party/ffmpeg/include/libavutil/avassert.h delete mode 100644 third_party/ffmpeg/include/libavutil/avconfig.h delete mode 100644 third_party/ffmpeg/include/libavutil/avstring.h delete mode 100644 third_party/ffmpeg/include/libavutil/avutil.h delete mode 100644 third_party/ffmpeg/include/libavutil/base64.h delete mode 100644 third_party/ffmpeg/include/libavutil/blowfish.h delete mode 100644 third_party/ffmpeg/include/libavutil/bprint.h delete mode 100644 third_party/ffmpeg/include/libavutil/bswap.h delete mode 100644 third_party/ffmpeg/include/libavutil/buffer.h delete mode 100644 third_party/ffmpeg/include/libavutil/camellia.h delete mode 100644 third_party/ffmpeg/include/libavutil/cast5.h delete mode 100644 third_party/ffmpeg/include/libavutil/channel_layout.h delete mode 100644 third_party/ffmpeg/include/libavutil/common.h delete mode 100644 third_party/ffmpeg/include/libavutil/cpu.h delete mode 100644 third_party/ffmpeg/include/libavutil/crc.h delete mode 100644 third_party/ffmpeg/include/libavutil/csp.h delete mode 100644 third_party/ffmpeg/include/libavutil/des.h delete mode 100644 third_party/ffmpeg/include/libavutil/detection_bbox.h delete mode 100644 third_party/ffmpeg/include/libavutil/dict.h delete mode 100644 third_party/ffmpeg/include/libavutil/display.h delete mode 100644 third_party/ffmpeg/include/libavutil/dovi_meta.h delete mode 100644 third_party/ffmpeg/include/libavutil/downmix_info.h delete mode 100644 third_party/ffmpeg/include/libavutil/encryption_info.h delete mode 100644 third_party/ffmpeg/include/libavutil/error.h delete mode 100644 third_party/ffmpeg/include/libavutil/eval.h delete mode 100644 third_party/ffmpeg/include/libavutil/executor.h delete mode 100644 third_party/ffmpeg/include/libavutil/ffversion.h delete mode 100644 third_party/ffmpeg/include/libavutil/fifo.h delete mode 100644 third_party/ffmpeg/include/libavutil/file.h delete mode 100644 third_party/ffmpeg/include/libavutil/film_grain_params.h delete mode 100644 third_party/ffmpeg/include/libavutil/frame.h delete mode 100644 third_party/ffmpeg/include/libavutil/hash.h delete mode 100644 third_party/ffmpeg/include/libavutil/hdr_dynamic_metadata.h delete mode 100644 third_party/ffmpeg/include/libavutil/hdr_dynamic_vivid_metadata.h delete mode 100644 third_party/ffmpeg/include/libavutil/hmac.h delete mode 100644 third_party/ffmpeg/include/libavutil/hwcontext.h delete mode 100644 third_party/ffmpeg/include/libavutil/hwcontext_cuda.h delete mode 100644 third_party/ffmpeg/include/libavutil/hwcontext_d3d11va.h delete mode 100644 third_party/ffmpeg/include/libavutil/hwcontext_drm.h delete mode 100644 third_party/ffmpeg/include/libavutil/hwcontext_dxva2.h delete mode 100644 third_party/ffmpeg/include/libavutil/hwcontext_mediacodec.h delete mode 100644 third_party/ffmpeg/include/libavutil/hwcontext_opencl.h delete mode 100644 third_party/ffmpeg/include/libavutil/hwcontext_qsv.h delete mode 100644 third_party/ffmpeg/include/libavutil/hwcontext_vaapi.h delete mode 100644 third_party/ffmpeg/include/libavutil/hwcontext_vdpau.h delete mode 100644 third_party/ffmpeg/include/libavutil/hwcontext_videotoolbox.h delete mode 100644 third_party/ffmpeg/include/libavutil/hwcontext_vulkan.h delete mode 100644 third_party/ffmpeg/include/libavutil/imgutils.h delete mode 100644 third_party/ffmpeg/include/libavutil/intfloat.h delete mode 100644 third_party/ffmpeg/include/libavutil/intreadwrite.h delete mode 100644 third_party/ffmpeg/include/libavutil/lfg.h delete mode 100644 third_party/ffmpeg/include/libavutil/log.h delete mode 100644 third_party/ffmpeg/include/libavutil/lzo.h delete mode 100644 third_party/ffmpeg/include/libavutil/macros.h delete mode 100644 third_party/ffmpeg/include/libavutil/mastering_display_metadata.h delete mode 100644 third_party/ffmpeg/include/libavutil/mathematics.h delete mode 100644 third_party/ffmpeg/include/libavutil/md5.h delete mode 100644 third_party/ffmpeg/include/libavutil/mem.h delete mode 100644 third_party/ffmpeg/include/libavutil/motion_vector.h delete mode 100644 third_party/ffmpeg/include/libavutil/murmur3.h delete mode 100644 third_party/ffmpeg/include/libavutil/opt.h delete mode 100644 third_party/ffmpeg/include/libavutil/parseutils.h delete mode 100644 third_party/ffmpeg/include/libavutil/pixdesc.h delete mode 100644 third_party/ffmpeg/include/libavutil/pixelutils.h delete mode 100644 third_party/ffmpeg/include/libavutil/pixfmt.h delete mode 100644 third_party/ffmpeg/include/libavutil/random_seed.h delete mode 100644 third_party/ffmpeg/include/libavutil/rational.h delete mode 100644 third_party/ffmpeg/include/libavutil/rc4.h delete mode 100644 third_party/ffmpeg/include/libavutil/replaygain.h delete mode 100644 third_party/ffmpeg/include/libavutil/ripemd.h delete mode 100644 third_party/ffmpeg/include/libavutil/samplefmt.h delete mode 100644 third_party/ffmpeg/include/libavutil/sha.h delete mode 100644 third_party/ffmpeg/include/libavutil/sha512.h delete mode 100644 third_party/ffmpeg/include/libavutil/spherical.h delete mode 100644 third_party/ffmpeg/include/libavutil/stereo3d.h delete mode 100644 third_party/ffmpeg/include/libavutil/tea.h delete mode 100644 third_party/ffmpeg/include/libavutil/threadmessage.h delete mode 100644 third_party/ffmpeg/include/libavutil/time.h delete mode 100644 third_party/ffmpeg/include/libavutil/timecode.h delete mode 100644 third_party/ffmpeg/include/libavutil/timestamp.h delete mode 100644 third_party/ffmpeg/include/libavutil/tree.h delete mode 100644 third_party/ffmpeg/include/libavutil/twofish.h delete mode 100644 third_party/ffmpeg/include/libavutil/tx.h delete mode 100644 third_party/ffmpeg/include/libavutil/uuid.h delete mode 100644 third_party/ffmpeg/include/libavutil/version.h delete mode 100644 third_party/ffmpeg/include/libavutil/video_enc_params.h delete mode 100644 third_party/ffmpeg/include/libavutil/video_hint.h delete mode 100644 third_party/ffmpeg/include/libavutil/xtea.h delete mode 100644 third_party/ffmpeg/include/x264.h delete mode 100644 third_party/ffmpeg/include/x264_config.h delete mode 100644 third_party/ffmpeg/larch64/lib/libavcodec.a delete mode 100644 third_party/ffmpeg/larch64/lib/libavformat.a delete mode 100644 third_party/ffmpeg/larch64/lib/libavutil.a delete mode 100644 third_party/ffmpeg/larch64/lib/libx264.a delete mode 100644 third_party/ffmpeg/x86_64/lib/libavcodec.a delete mode 100644 third_party/ffmpeg/x86_64/lib/libavformat.a delete mode 100644 third_party/ffmpeg/x86_64/lib/libavutil.a delete mode 100644 third_party/ffmpeg/x86_64/lib/libx264.a diff --git a/.gitattributes b/.gitattributes index 152dbfe456..cc1605a132 100644 --- a/.gitattributes +++ b/.gitattributes @@ -15,7 +15,6 @@ third_party/**/*.a filter=lfs diff=lfs merge=lfs -text third_party/**/*.so filter=lfs diff=lfs merge=lfs -text third_party/**/*.so.* filter=lfs diff=lfs merge=lfs -text third_party/**/*.dylib filter=lfs diff=lfs merge=lfs -text -third_party/ffmpeg/include/**/*.h filter=lfs diff=lfs merge=lfs -text third_party/acados/*/t_renderer filter=lfs diff=lfs merge=lfs -text third_party/qt5/larch64/bin/lrelease filter=lfs diff=lfs merge=lfs -text third_party/qt5/larch64/bin/lupdate filter=lfs diff=lfs merge=lfs -text diff --git a/SConstruct b/SConstruct index a788b9a290..5b13bd635a 100644 --- a/SConstruct +++ b/SConstruct @@ -91,7 +91,6 @@ if arch == "larch64": ] libpath = [ - f"#third_party/ffmpeg/{arch}/lib", "/usr/local/lib", "/system/vendor/lib64", f"#third_party/acados/{arch}/lib", @@ -115,7 +114,6 @@ else: libpath = [ f"#third_party/libyuv/{arch}/lib", f"#third_party/acados/{arch}/lib", - f"#third_party/ffmpeg/{arch}/lib", f"{brew_prefix}/lib", f"{brew_prefix}/opt/openssl@3.0/lib", "/System/Library/Frameworks/OpenGL.framework/Libraries", @@ -132,7 +130,6 @@ else: libpath = [ f"#third_party/acados/{arch}/lib", f"#third_party/libyuv/{arch}/lib", - f"#third_party/ffmpeg/{arch}/lib", "/usr/lib", "/usr/local/lib", ] @@ -180,7 +177,6 @@ env = Environment( "#third_party/libyuv/include", "#third_party/json11", "#third_party/linux/include", - "#third_party/ffmpeg/include", "#third_party", "#msgq", ], diff --git a/system/loggerd/SConscript b/system/loggerd/SConscript index c87db4232b..cf169f4dc6 100644 --- a/system/loggerd/SConscript +++ b/system/loggerd/SConscript @@ -1,8 +1,8 @@ Import('env', 'arch', 'messaging', 'common', 'visionipc') libs = [common, messaging, visionipc, - 'yuv', 'OpenCL', 'pthread', 'zstd', - 'avformat', 'avcodec', 'avutil', 'x264'] + 'avformat', 'avcodec', 'avutil', + 'yuv', 'OpenCL', 'pthread', 'zstd'] src = ['logger.cc', 'zstd_writer.cc', 'video_writer.cc', 'encoder/encoder.cc', 'encoder/v4l_encoder.cc', 'encoder/jpeg_encoder.cc'] if arch != "larch64": diff --git a/system/loggerd/tests/test_loggerd.py b/system/loggerd/tests/test_loggerd.py index ae7196684d..c6a4b12e63 100644 --- a/system/loggerd/tests/test_loggerd.py +++ b/system/loggerd/tests/test_loggerd.py @@ -316,18 +316,8 @@ class TestLoggerd: self._publish_camera_and_audio_messages() qcamera_ts_path = os.path.join(self._get_latest_log_dir(), 'qcamera.ts') - - # simplest heuristic: look for AAC ADTS syncwords in the TS file - def ts_has_audio_stream(ts_path: str) -> bool: - try: - with open(ts_path, 'rb') as f: - data = f.read() - # ADTS headers typically start with 0xFFF1 or 0xFFF9 - return (b"\xFF\xF1" in data) or (b"\xFF\xF9" in data) - except Exception: - return False - - has_audio_stream = ts_has_audio_stream(qcamera_ts_path) + ffprobe_cmd = f"ffprobe -i {qcamera_ts_path} -show_streams -select_streams a -loglevel error" + has_audio_stream = subprocess.run(ffprobe_cmd, shell=True, capture_output=True).stdout.strip() != b'' assert has_audio_stream == record_audio raw_audio_in_rlog = any(m.which() == 'rawAudioData' for m in LogReader(os.path.join(self._get_latest_log_dir(), 'rlog.zst'))) diff --git a/third_party/.gitignore b/third_party/.gitignore index 0d5b3d2213..0d20b6487c 100644 --- a/third_party/.gitignore +++ b/third_party/.gitignore @@ -1,3 +1 @@ *.pyc -src/ -build/ diff --git a/third_party/ffmpeg/Darwin/lib/libavcodec.a b/third_party/ffmpeg/Darwin/lib/libavcodec.a deleted file mode 100644 index a87d3323ce..0000000000 --- a/third_party/ffmpeg/Darwin/lib/libavcodec.a +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:2dcb729a6833558fc0e01abe5e728eba2b3c215abc7dece74d5ce1bc1d279e7d -size 2328832 diff --git a/third_party/ffmpeg/Darwin/lib/libavformat.a b/third_party/ffmpeg/Darwin/lib/libavformat.a deleted file mode 100644 index b7c48f7961..0000000000 --- a/third_party/ffmpeg/Darwin/lib/libavformat.a +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:825f145f7168226deae199538113f063e6b71a02999b297c75254dfa466b73cb -size 863544 diff --git a/third_party/ffmpeg/Darwin/lib/libavutil.a b/third_party/ffmpeg/Darwin/lib/libavutil.a deleted file mode 100644 index 17985d73b6..0000000000 --- a/third_party/ffmpeg/Darwin/lib/libavutil.a +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:9c13c341440029d06a1044479876843bc93615849554dc636e386f31f6776850 -size 789024 diff --git a/third_party/ffmpeg/Darwin/lib/libx264.a b/third_party/ffmpeg/Darwin/lib/libx264.a deleted file mode 100644 index 27375793a9..0000000000 --- a/third_party/ffmpeg/Darwin/lib/libx264.a +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:8bedf59051187092bd9f282acb7f22f7885ed41b2f89692e0478252329bd7e4b -size 1941808 diff --git a/third_party/ffmpeg/build.sh b/third_party/ffmpeg/build.sh deleted file mode 100755 index f8812d6f17..0000000000 --- a/third_party/ffmpeg/build.sh +++ /dev/null @@ -1,83 +0,0 @@ -#!/usr/bin/env bash -set -e - -DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" >/dev/null && pwd)" -cd $DIR - -# Detect arch -ARCHNAME="x86_64" -if [ -f /TICI ]; then - ARCHNAME="larch64" -fi -if [[ "$OSTYPE" == "darwin"* ]]; then - ARCHNAME="Darwin" -fi - -VERSION="6.1.1" # LTS -PREFIX="$DIR/$ARCHNAME" -BUILD_DIR="$DIR/build/" - -mkdir -p "$BUILD_DIR" -rm -rf include/ && mkdir -p include/ -rm -rf "$PREFIX" && mkdir -p "$PREFIX" - -# *** build x264 *** -if [[ ! -d "$DIR/src/x264/" ]]; then - # TODO: pin to a commit - git clone --depth=1 --branch "stable" https://code.videolan.org/videolan/x264.git "$DIR/src/x264/" -fi -cd $DIR/src/x264 -git fetch origin b35605ace3ddf7c1a5d67a2eb553f034aef41d55 -git checkout -f FETCH_HEAD -./configure --prefix="$PREFIX" --enable-static --disable-opencl --enable-pic --disable-cli -make -j8 -make install -cp -a "$PREFIX/include/." "$DIR/include/" - -# *** build ffmpeg *** -mkdir -p "$DIR/src" -if [[ ! -d "$DIR/src/ffmpeg-$VERSION" ]]; then - echo "Downloading FFmpeg $VERSION ..." - curl -L "https://ffmpeg.org/releases/ffmpeg-${VERSION}.tar.xz" -o "$DIR/src/ffmpeg-${VERSION}.tar.xz" - tar -C "$DIR/src" -xf "$DIR/src/ffmpeg-${VERSION}.tar.xz" -fi - -cd $BUILD_DIR - -export PKG_CONFIG_PATH="$PREFIX/lib/pkgconfig:${PKG_CONFIG_PATH:-}" -export EXTRA_CFLAGS="-I$PREFIX/include ${EXTRA_CFLAGS:-}" -export EXTRA_LDFLAGS="-L$PREFIX/lib ${EXTRA_LDFLAGS:-}" -# Configure minimal static FFmpeg for desktop Linux tools -"$DIR/src/ffmpeg-$VERSION/configure" \ - --prefix="$PREFIX" \ - --datadir="$PREFIX" \ - --docdir="$PREFIX" \ - --mandir="$PREFIX" \ - --enable-static --disable-shared \ - --disable-programs --disable-doc --disable-debug \ - --disable-network \ - --disable-avdevice --disable-swscale --disable-swresample --disable-postproc --disable-avfilter \ - --disable-autodetect --disable-iconv \ - --enable-avcodec --enable-avformat --enable-avutil \ - --enable-protocol=file \ - --pkg-config-flags=--static \ - --enable-gpl --enable-libx264 \ - --disable-decoders --enable-decoder=h264,hevc,aac \ - --disable-encoders --enable-encoder=libx264,ffvhuff,aac \ - --disable-demuxers --enable-demuxer=mpegts,hevc,h264,matroska,mov \ - --disable-muxers --enable-muxer=matroska,mpegts \ - --disable-parsers --enable-parser=h264,hevc,aac,vorbis \ - --disable-bsfs \ - --enable-small \ - --extra-cflags="${EXTRA_CFLAGS:-}" \ - --extra-ldflags="${EXTRA_LDFLAGS:-}" - - -make -j$(nproc) -make install -cp -a "$PREFIX/include/." "$DIR/include/" - -# *** cleanup *** -cd $PREFIX -rm -rf share/ doc/ man/ examples/ examples/ include/ lib/pkgconfig/ -rm -f lib/libavfilter* "$DIR/include/libavfilter*" diff --git a/third_party/ffmpeg/include/libavcodec/ac3_parser.h b/third_party/ffmpeg/include/libavcodec/ac3_parser.h deleted file mode 100644 index c8acedae83..0000000000 --- a/third_party/ffmpeg/include/libavcodec/ac3_parser.h +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:200c6d2e96975196e8ba5f5716223dc9dda999d51578dabce2fca93175a05252 -size 1207 diff --git a/third_party/ffmpeg/include/libavcodec/adts_parser.h b/third_party/ffmpeg/include/libavcodec/adts_parser.h deleted file mode 100644 index 031f10320a..0000000000 --- a/third_party/ffmpeg/include/libavcodec/adts_parser.h +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:d466583a8dc1260b015e588adbe3abd45f3f8ca0e43722f3088b472e80492a15 -size 1354 diff --git a/third_party/ffmpeg/include/libavcodec/avcodec.h b/third_party/ffmpeg/include/libavcodec/avcodec.h deleted file mode 100644 index 82fc7d1bd1..0000000000 --- a/third_party/ffmpeg/include/libavcodec/avcodec.h +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:fc38e85633a2c6c44fc60b319d7e046a6e4206456565aa61240dd93ee2e81188 -size 114251 diff --git a/third_party/ffmpeg/include/libavcodec/avdct.h b/third_party/ffmpeg/include/libavcodec/avdct.h deleted file mode 100644 index 1a57c43007..0000000000 --- a/third_party/ffmpeg/include/libavcodec/avdct.h +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:7c125edc1985ec078f99abb1c9044c4fc76b06a03eb02c026cb968fb9d41fcca -size 2726 diff --git a/third_party/ffmpeg/include/libavcodec/avfft.h b/third_party/ffmpeg/include/libavcodec/avfft.h deleted file mode 100644 index f54c365c1c..0000000000 --- a/third_party/ffmpeg/include/libavcodec/avfft.h +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:81bb6c5359f57de53b0e39766591404b632d15e700d313c97ded234d63d4e393 -size 4081 diff --git a/third_party/ffmpeg/include/libavcodec/bsf.h b/third_party/ffmpeg/include/libavcodec/bsf.h deleted file mode 100644 index 54fc91b112..0000000000 --- a/third_party/ffmpeg/include/libavcodec/bsf.h +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:cc26676aa44638fa5cbef953d967e19e2084b46aaa100f0a35ba2d34b302301c -size 11540 diff --git a/third_party/ffmpeg/include/libavcodec/codec.h b/third_party/ffmpeg/include/libavcodec/codec.h deleted file mode 100644 index b8c3841727..0000000000 --- a/third_party/ffmpeg/include/libavcodec/codec.h +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:d8b75f2e4128ce59db3172e2bdcbf64540424e6242952dc0912002bee5314254 -size 13460 diff --git a/third_party/ffmpeg/include/libavcodec/codec_desc.h b/third_party/ffmpeg/include/libavcodec/codec_desc.h deleted file mode 100644 index 108aa120d9..0000000000 --- a/third_party/ffmpeg/include/libavcodec/codec_desc.h +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:4c1a8d02398cc82c1913487405c483f4d74ec71ed3e666ed7e7570f581c8f479 -size 3974 diff --git a/third_party/ffmpeg/include/libavcodec/codec_id.h b/third_party/ffmpeg/include/libavcodec/codec_id.h deleted file mode 100644 index 72002e6892..0000000000 --- a/third_party/ffmpeg/include/libavcodec/codec_id.h +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:754a846797be20c7c1ca30358d2555873df3bb19b6b2c8011c85697440f600df -size 18020 diff --git a/third_party/ffmpeg/include/libavcodec/codec_par.h b/third_party/ffmpeg/include/libavcodec/codec_par.h deleted file mode 100644 index 2c2f42e885..0000000000 --- a/third_party/ffmpeg/include/libavcodec/codec_par.h +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:5f2bef7f23782ac9c0b5769eeb54704103efa5074ca5b657d7f01890795baf08 -size 8065 diff --git a/third_party/ffmpeg/include/libavcodec/d3d11va.h b/third_party/ffmpeg/include/libavcodec/d3d11va.h deleted file mode 100644 index aa372312b4..0000000000 --- a/third_party/ffmpeg/include/libavcodec/d3d11va.h +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:74a55a2e3f19ce797e99624a224302f25efa89a115b9bf2e932c8fa179b0cc66 -size 2853 diff --git a/third_party/ffmpeg/include/libavcodec/defs.h b/third_party/ffmpeg/include/libavcodec/defs.h deleted file mode 100644 index 6467ef6639..0000000000 --- a/third_party/ffmpeg/include/libavcodec/defs.h +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:0bb9d7049499d252c75f1fe15fced5022ebb30d1966d47217848236eb021604a -size 12358 diff --git a/third_party/ffmpeg/include/libavcodec/dirac.h b/third_party/ffmpeg/include/libavcodec/dirac.h deleted file mode 100644 index 8bf7c4a0d3..0000000000 --- a/third_party/ffmpeg/include/libavcodec/dirac.h +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:09fd1f670422ee61713568abd90fdf371b30e6fe35bc6fb8213f1ad32b45cf56 -size 4126 diff --git a/third_party/ffmpeg/include/libavcodec/dv_profile.h b/third_party/ffmpeg/include/libavcodec/dv_profile.h deleted file mode 100644 index 738746f3fc..0000000000 --- a/third_party/ffmpeg/include/libavcodec/dv_profile.h +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:19f59e0b20ac583de4bfd76d18889d334bf0b6cdf7b5356723a33f3874738466 -size 3694 diff --git a/third_party/ffmpeg/include/libavcodec/dxva2.h b/third_party/ffmpeg/include/libavcodec/dxva2.h deleted file mode 100644 index aa41fbba83..0000000000 --- a/third_party/ffmpeg/include/libavcodec/dxva2.h +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:e69dc45a7d5a9206b3bfead10caf3117117005cd532c4fc599d9976637c1b9e3 -size 2361 diff --git a/third_party/ffmpeg/include/libavcodec/jni.h b/third_party/ffmpeg/include/libavcodec/jni.h deleted file mode 100644 index 942690da84..0000000000 --- a/third_party/ffmpeg/include/libavcodec/jni.h +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:18ca8eae5bce081b4eef1b1f61a62aefed1d4e6e3cde41487c81fb96ee709e51 -size 1650 diff --git a/third_party/ffmpeg/include/libavcodec/mediacodec.h b/third_party/ffmpeg/include/libavcodec/mediacodec.h deleted file mode 100644 index 2afacbd1dc..0000000000 --- a/third_party/ffmpeg/include/libavcodec/mediacodec.h +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:1f64544000dd2f2ec94604d5fcf7c2a6d26d32d085264356084a4b53a7f0c3f0 -size 3570 diff --git a/third_party/ffmpeg/include/libavcodec/packet.h b/third_party/ffmpeg/include/libavcodec/packet.h deleted file mode 100644 index 7c11f362ec..0000000000 --- a/third_party/ffmpeg/include/libavcodec/packet.h +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:18eb41b9aa9ec55b3ee3932279cc54ead813710741f004c5ea5a1c2957896f59 -size 28678 diff --git a/third_party/ffmpeg/include/libavcodec/qsv.h b/third_party/ffmpeg/include/libavcodec/qsv.h deleted file mode 100644 index 02c4c961f3..0000000000 --- a/third_party/ffmpeg/include/libavcodec/qsv.h +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:e45780237ab0e9ea9ec11aab9f62dfb8b059138f846632ecacdc024db16dfb1b -size 3844 diff --git a/third_party/ffmpeg/include/libavcodec/vdpau.h b/third_party/ffmpeg/include/libavcodec/vdpau.h deleted file mode 100644 index 6ccba34dbc..0000000000 --- a/third_party/ffmpeg/include/libavcodec/vdpau.h +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:3e0c963348495936556724cfb4d2d35eb4c14007ba72d51be94dd26c83d93fb8 -size 5104 diff --git a/third_party/ffmpeg/include/libavcodec/version.h b/third_party/ffmpeg/include/libavcodec/version.h deleted file mode 100644 index 9f2069af2d..0000000000 --- a/third_party/ffmpeg/include/libavcodec/version.h +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:b6938a71f9eb6b1ef2a201499f47ef1131869b90755932a2ee70a272b2ee0784 -size 1619 diff --git a/third_party/ffmpeg/include/libavcodec/version_major.h b/third_party/ffmpeg/include/libavcodec/version_major.h deleted file mode 100644 index 7781faab45..0000000000 --- a/third_party/ffmpeg/include/libavcodec/version_major.h +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:e9562c933e8eebb020eb143d21c4b2b529e2dc38d2d7365bc13adb8d0ef8227b -size 2494 diff --git a/third_party/ffmpeg/include/libavcodec/videotoolbox.h b/third_party/ffmpeg/include/libavcodec/videotoolbox.h deleted file mode 100644 index 59f788e025..0000000000 --- a/third_party/ffmpeg/include/libavcodec/videotoolbox.h +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:19b6ba05f4e9f600044f45f1a5dc04d0da9276dc9a1cb5b07826df5cab5012c9 -size 4677 diff --git a/third_party/ffmpeg/include/libavcodec/vorbis_parser.h b/third_party/ffmpeg/include/libavcodec/vorbis_parser.h deleted file mode 100644 index d578829d44..0000000000 --- a/third_party/ffmpeg/include/libavcodec/vorbis_parser.h +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:57077b2e1d28d42636cab0f69e4b92b1ad64ac2eaa2843c270a6afaf308a76ae -size 2285 diff --git a/third_party/ffmpeg/include/libavcodec/xvmc.h b/third_party/ffmpeg/include/libavcodec/xvmc.h deleted file mode 100644 index abe162a93b..0000000000 --- a/third_party/ffmpeg/include/libavcodec/xvmc.h +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:ca59c5caaaa32368f7c84c714bbf2ad1cba61ec9ca5b5cb1a14cf6975affe8a2 -size 6136 diff --git a/third_party/ffmpeg/include/libavformat/avformat.h b/third_party/ffmpeg/include/libavformat/avformat.h deleted file mode 100644 index a4244e9137..0000000000 --- a/third_party/ffmpeg/include/libavformat/avformat.h +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:c1ca6edf1d5eab00126fa7320f01c21ed8cea09dc2d931f84a4015b9e50f8d2a -size 110803 diff --git a/third_party/ffmpeg/include/libavformat/avio.h b/third_party/ffmpeg/include/libavformat/avio.h deleted file mode 100644 index af9666e186..0000000000 --- a/third_party/ffmpeg/include/libavformat/avio.h +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:de6fe4be374481b1ee5ba8722882af7e7698038fd744375de153d1c78f528836 -size 31681 diff --git a/third_party/ffmpeg/include/libavformat/version.h b/third_party/ffmpeg/include/libavformat/version.h deleted file mode 100644 index 07fe55f955..0000000000 --- a/third_party/ffmpeg/include/libavformat/version.h +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:08b64bb52109a07ae3ee1a1dafd12ad336d0a646c23aea075c5024b9437f3b29 -size 1652 diff --git a/third_party/ffmpeg/include/libavformat/version_major.h b/third_party/ffmpeg/include/libavformat/version_major.h deleted file mode 100644 index 0efde349bb..0000000000 --- a/third_party/ffmpeg/include/libavformat/version_major.h +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:2d440097abe2039c3c831d3b91d315857829d04e462415ee632c9f36321d520d -size 2240 diff --git a/third_party/ffmpeg/include/libavutil/adler32.h b/third_party/ffmpeg/include/libavutil/adler32.h deleted file mode 100644 index 19f01b3441..0000000000 --- a/third_party/ffmpeg/include/libavutil/adler32.h +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:f21a861957bf4b1812ed67fdc528890f9cff1bb483facf0f5109e4a51932fe3b -size 1696 diff --git a/third_party/ffmpeg/include/libavutil/aes.h b/third_party/ffmpeg/include/libavutil/aes.h deleted file mode 100644 index 6d81ffa43e..0000000000 --- a/third_party/ffmpeg/include/libavutil/aes.h +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:0a86ebeaf9ed33548bf0f92359f7047e521d4d80fe6b0ef1c8ef9505e38b6d28 -size 1912 diff --git a/third_party/ffmpeg/include/libavutil/aes_ctr.h b/third_party/ffmpeg/include/libavutil/aes_ctr.h deleted file mode 100644 index 1a156aed36..0000000000 --- a/third_party/ffmpeg/include/libavutil/aes_ctr.h +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:fbbb94888bfab2ea7141e7e1afa5872de099e7ee57baea17632c3d4fdd2cba3f -size 2443 diff --git a/third_party/ffmpeg/include/libavutil/ambient_viewing_environment.h b/third_party/ffmpeg/include/libavutil/ambient_viewing_environment.h deleted file mode 100644 index 42a94d1941..0000000000 --- a/third_party/ffmpeg/include/libavutil/ambient_viewing_environment.h +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:00135de08089f8c711bb113588f80575a1d26e86d50b6dac5928a27a0ff9a8c7 -size 2585 diff --git a/third_party/ffmpeg/include/libavutil/attributes.h b/third_party/ffmpeg/include/libavutil/attributes.h deleted file mode 100644 index 2a47842614..0000000000 --- a/third_party/ffmpeg/include/libavutil/attributes.h +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:1f51258ba39861e08cbc8d407ec37a8d0fd28669aa7306c1365cb9c675fa1d76 -size 4850 diff --git a/third_party/ffmpeg/include/libavutil/audio_fifo.h b/third_party/ffmpeg/include/libavutil/audio_fifo.h deleted file mode 100644 index 28a3364eee..0000000000 --- a/third_party/ffmpeg/include/libavutil/audio_fifo.h +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:3c513ca46927346c0673cd9db302afe62dbbf976844f36da0307fd10f7f47bfd -size 5966 diff --git a/third_party/ffmpeg/include/libavutil/avassert.h b/third_party/ffmpeg/include/libavutil/avassert.h deleted file mode 100644 index 40ecca50e9..0000000000 --- a/third_party/ffmpeg/include/libavutil/avassert.h +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:39dfe16f0790daa5d6b9b1bad3167c3c9e638c72452e0acdaf2d163c9c75ea40 -size 2408 diff --git a/third_party/ffmpeg/include/libavutil/avconfig.h b/third_party/ffmpeg/include/libavutil/avconfig.h deleted file mode 100644 index 4e1eedcf99..0000000000 --- a/third_party/ffmpeg/include/libavutil/avconfig.h +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:975611ad5eba15212d9e1d5fca9d4fdf0daec6d2269b2fcab8e29af8667164bc -size 180 diff --git a/third_party/ffmpeg/include/libavutil/avstring.h b/third_party/ffmpeg/include/libavutil/avstring.h deleted file mode 100644 index ce048414e3..0000000000 --- a/third_party/ffmpeg/include/libavutil/avstring.h +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:ac51462bf55ff62da39db4b15c7a6b9b783387709f06879196a065691b34edbf -size 14940 diff --git a/third_party/ffmpeg/include/libavutil/avutil.h b/third_party/ffmpeg/include/libavutil/avutil.h deleted file mode 100644 index 7f3e2654eb..0000000000 --- a/third_party/ffmpeg/include/libavutil/avutil.h +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:7640d72de6a72eb9589ed2c623b4ec0924a241097846086c62dc3e05ab70ee9e -size 9968 diff --git a/third_party/ffmpeg/include/libavutil/base64.h b/third_party/ffmpeg/include/libavutil/base64.h deleted file mode 100644 index db8221772a..0000000000 --- a/third_party/ffmpeg/include/libavutil/base64.h +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:81ac13d23f3744fe85ea2651ce903e201cd55fc63fcdd899d2cfe5560d50ef3d -size 2285 diff --git a/third_party/ffmpeg/include/libavutil/blowfish.h b/third_party/ffmpeg/include/libavutil/blowfish.h deleted file mode 100644 index c16f03bfd2..0000000000 --- a/third_party/ffmpeg/include/libavutil/blowfish.h +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:b955a63c60c8b3be0203ec6c3973f9084d848cf884fe56cd56088301aeef7992 -size 2394 diff --git a/third_party/ffmpeg/include/libavutil/bprint.h b/third_party/ffmpeg/include/libavutil/bprint.h deleted file mode 100644 index 9a55285676..0000000000 --- a/third_party/ffmpeg/include/libavutil/bprint.h +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:c19f6dc2c06e55d47bc1fbe9fc7658acc7a0d506b6baf16839a6119a03e873c1 -size 8812 diff --git a/third_party/ffmpeg/include/libavutil/bswap.h b/third_party/ffmpeg/include/libavutil/bswap.h deleted file mode 100644 index b8e017531e..0000000000 --- a/third_party/ffmpeg/include/libavutil/bswap.h +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:855e138f6d8c7947553b1c63a7bab06bcb71362f03c72b761fd9ed61820d71aa -size 2903 diff --git a/third_party/ffmpeg/include/libavutil/buffer.h b/third_party/ffmpeg/include/libavutil/buffer.h deleted file mode 100644 index fd462ec6b8..0000000000 --- a/third_party/ffmpeg/include/libavutil/buffer.h +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:f16742d574216434580573a2b09f56fc5b66b7dda1960d4f02ba59e3269ba548 -size 11998 diff --git a/third_party/ffmpeg/include/libavutil/camellia.h b/third_party/ffmpeg/include/libavutil/camellia.h deleted file mode 100644 index 8d6fdaca6c..0000000000 --- a/third_party/ffmpeg/include/libavutil/camellia.h +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:1db30753e71c73f1937e807850069e8215cdf37a1bc3ff89d3a6370a719c1fde -size 2139 diff --git a/third_party/ffmpeg/include/libavutil/cast5.h b/third_party/ffmpeg/include/libavutil/cast5.h deleted file mode 100644 index 2dfac6f5b2..0000000000 --- a/third_party/ffmpeg/include/libavutil/cast5.h +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:05b2e13aecaa0adbb470081a689f45baffb8e03a71997c31f37a22ea4e383a60 -size 2561 diff --git a/third_party/ffmpeg/include/libavutil/channel_layout.h b/third_party/ffmpeg/include/libavutil/channel_layout.h deleted file mode 100644 index 02549bd9a9..0000000000 --- a/third_party/ffmpeg/include/libavutil/channel_layout.h +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:5df118692f2b7043820f0e641f1968cadb66c39f0ba85fab7435391322a223f5 -size 33727 diff --git a/third_party/ffmpeg/include/libavutil/common.h b/third_party/ffmpeg/include/libavutil/common.h deleted file mode 100644 index 8f2dfcaebb..0000000000 --- a/third_party/ffmpeg/include/libavutil/common.h +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:d861dac3eaecc326fa8fb717d90f195d961cc8ac7898daccfefd10bd5ea42398 -size 17166 diff --git a/third_party/ffmpeg/include/libavutil/cpu.h b/third_party/ffmpeg/include/libavutil/cpu.h deleted file mode 100644 index 3181cd0896..0000000000 --- a/third_party/ffmpeg/include/libavutil/cpu.h +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:37c4ccea939e19b463a2a3e4c101ff8dd03c98847fc045395d28ba0c9db8b662 -size 6320 diff --git a/third_party/ffmpeg/include/libavutil/crc.h b/third_party/ffmpeg/include/libavutil/crc.h deleted file mode 100644 index 9cc23bb941..0000000000 --- a/third_party/ffmpeg/include/libavutil/crc.h +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:5728cf65705a46723ea28b4f6c8361aad82b76a90e859943efe8af0edb79ec86 -size 3259 diff --git a/third_party/ffmpeg/include/libavutil/csp.h b/third_party/ffmpeg/include/libavutil/csp.h deleted file mode 100644 index f4c8c5652c..0000000000 --- a/third_party/ffmpeg/include/libavutil/csp.h +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:7969fd662f31cf3180403510a6784a14af60d7f9bf3a569dde84585a696dff09 -size 4927 diff --git a/third_party/ffmpeg/include/libavutil/des.h b/third_party/ffmpeg/include/libavutil/des.h deleted file mode 100644 index 5df3354f97..0000000000 --- a/third_party/ffmpeg/include/libavutil/des.h +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:15ebdda1af65d91c4607a3444c5f749d5e9757ff5d7f4b04213b3194603f74d9 -size 2514 diff --git a/third_party/ffmpeg/include/libavutil/detection_bbox.h b/third_party/ffmpeg/include/libavutil/detection_bbox.h deleted file mode 100644 index f81ef0a64a..0000000000 --- a/third_party/ffmpeg/include/libavutil/detection_bbox.h +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:8f5817d77af243a52e905947aa5ae73c218d68dba909040b2f63bd2ca6f93922 -size 3524 diff --git a/third_party/ffmpeg/include/libavutil/dict.h b/third_party/ffmpeg/include/libavutil/dict.h deleted file mode 100644 index e01fbf8bb3..0000000000 --- a/third_party/ffmpeg/include/libavutil/dict.h +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:c95cba1829e7886e31469f4e058bb9af3c8f215619c7ffddbc2045c9039f0554 -size 9374 diff --git a/third_party/ffmpeg/include/libavutil/display.h b/third_party/ffmpeg/include/libavutil/display.h deleted file mode 100644 index 6bca44f9f8..0000000000 --- a/third_party/ffmpeg/include/libavutil/display.h +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:b9c78c80aa9331b945802b6bcd1db4ecc9ec4f9fad41993cc82b880c0dec2576 -size 3472 diff --git a/third_party/ffmpeg/include/libavutil/dovi_meta.h b/third_party/ffmpeg/include/libavutil/dovi_meta.h deleted file mode 100644 index 0d545564b2..0000000000 --- a/third_party/ffmpeg/include/libavutil/dovi_meta.h +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:3a67a422676c5b6e2dfd59b3e6a8e3f816b0602f5d73332c0b1d8e6b43644077 -size 7641 diff --git a/third_party/ffmpeg/include/libavutil/downmix_info.h b/third_party/ffmpeg/include/libavutil/downmix_info.h deleted file mode 100644 index cfebdff5be..0000000000 --- a/third_party/ffmpeg/include/libavutil/downmix_info.h +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:2fc23ad8f0750d82fcd6aa3b653998e2ea9721f9d1664df7b6cb80e93d7fa3aa -size 3235 diff --git a/third_party/ffmpeg/include/libavutil/encryption_info.h b/third_party/ffmpeg/include/libavutil/encryption_info.h deleted file mode 100644 index 490da787ff..0000000000 --- a/third_party/ffmpeg/include/libavutil/encryption_info.h +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:ccc3a4a889b8a3c5aaf37b9fb2407bcdf23a065487c7cba718518a517c463b18 -size 7056 diff --git a/third_party/ffmpeg/include/libavutil/error.h b/third_party/ffmpeg/include/libavutil/error.h deleted file mode 100644 index 30e492756d..0000000000 --- a/third_party/ffmpeg/include/libavutil/error.h +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:f90feec75a317e491618e06ce14d19218e5b0257c885155613b704002a9d5bda -size 5489 diff --git a/third_party/ffmpeg/include/libavutil/eval.h b/third_party/ffmpeg/include/libavutil/eval.h deleted file mode 100644 index 49448a05c7..0000000000 --- a/third_party/ffmpeg/include/libavutil/eval.h +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:5e92af6be91c610c3bcad3a344a2df5e3516153fc89045464447bb0ee44b1f56 -size 6599 diff --git a/third_party/ffmpeg/include/libavutil/executor.h b/third_party/ffmpeg/include/libavutil/executor.h deleted file mode 100644 index 91edf0541f..0000000000 --- a/third_party/ffmpeg/include/libavutil/executor.h +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:0c949cf5269ad933ed1a200ece06a3998db10147e1403629a398b7be52459cdc -size 1885 diff --git a/third_party/ffmpeg/include/libavutil/ffversion.h b/third_party/ffmpeg/include/libavutil/ffversion.h deleted file mode 100644 index 7fe4e44534..0000000000 --- a/third_party/ffmpeg/include/libavutil/ffversion.h +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:1defa7afe4fab2090455bf74435ce185bce721d1b795f94c56994a031ae20080 -size 184 diff --git a/third_party/ffmpeg/include/libavutil/fifo.h b/third_party/ffmpeg/include/libavutil/fifo.h deleted file mode 100644 index 8e4cff8600..0000000000 --- a/third_party/ffmpeg/include/libavutil/fifo.h +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:0c77e489715a83e1dc1ce3187b5e23b1b0cd52762638919e955d43afae316f9b -size 15452 diff --git a/third_party/ffmpeg/include/libavutil/file.h b/third_party/ffmpeg/include/libavutil/file.h deleted file mode 100644 index 44cae78190..0000000000 --- a/third_party/ffmpeg/include/libavutil/file.h +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:9f91c41bc9a14a206bc86c87b9edd7215b5be63b8aade2bda40297dc6752de36 -size 3039 diff --git a/third_party/ffmpeg/include/libavutil/film_grain_params.h b/third_party/ffmpeg/include/libavutil/film_grain_params.h deleted file mode 100644 index 8d052ff6d2..0000000000 --- a/third_party/ffmpeg/include/libavutil/film_grain_params.h +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:e1bda2934dce25cb0bb9fa6eaae230cd21aca79428905b66417f74fc8f0fa72a -size 8499 diff --git a/third_party/ffmpeg/include/libavutil/frame.h b/third_party/ffmpeg/include/libavutil/frame.h deleted file mode 100644 index 013f70247f..0000000000 --- a/third_party/ffmpeg/include/libavutil/frame.h +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:0512cdd2a4479faac17b556f6311a3307ace2a5278217c4d738bd752c07dc37e -size 35894 diff --git a/third_party/ffmpeg/include/libavutil/hash.h b/third_party/ffmpeg/include/libavutil/hash.h deleted file mode 100644 index db71ca59f5..0000000000 --- a/third_party/ffmpeg/include/libavutil/hash.h +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:b0896571267220736679eea28c454783795a02a0f1aef008ebe7c40489a75fdd -size 8457 diff --git a/third_party/ffmpeg/include/libavutil/hdr_dynamic_metadata.h b/third_party/ffmpeg/include/libavutil/hdr_dynamic_metadata.h deleted file mode 100644 index f920e30d6c..0000000000 --- a/third_party/ffmpeg/include/libavutil/hdr_dynamic_metadata.h +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:457274c2eda1fe91e83ae76b9d1ab8682e6144adfacbd2c86f5fb4a03ede421f -size 14385 diff --git a/third_party/ffmpeg/include/libavutil/hdr_dynamic_vivid_metadata.h b/third_party/ffmpeg/include/libavutil/hdr_dynamic_vivid_metadata.h deleted file mode 100644 index 64e00109fe..0000000000 --- a/third_party/ffmpeg/include/libavutil/hdr_dynamic_vivid_metadata.h +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:9f50e471376bc9e8ca504a338cfe74ef634b8f2c242ccefed2e4da67197112de -size 10004 diff --git a/third_party/ffmpeg/include/libavutil/hmac.h b/third_party/ffmpeg/include/libavutil/hmac.h deleted file mode 100644 index 919dc1ec2a..0000000000 --- a/third_party/ffmpeg/include/libavutil/hmac.h +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:d14d625a897d6bba0668acdf33dc597bb0050237c5c1a5f7e568fe36822782e7 -size 2865 diff --git a/third_party/ffmpeg/include/libavutil/hwcontext.h b/third_party/ffmpeg/include/libavutil/hwcontext.h deleted file mode 100644 index 5ccfbbe916..0000000000 --- a/third_party/ffmpeg/include/libavutil/hwcontext.h +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:e05c09b0a2f51c800aa57dc21277b5b4534e6783ab3df52dbf81c63e37fe8323 -size 24341 diff --git a/third_party/ffmpeg/include/libavutil/hwcontext_cuda.h b/third_party/ffmpeg/include/libavutil/hwcontext_cuda.h deleted file mode 100644 index c596a2781d..0000000000 --- a/third_party/ffmpeg/include/libavutil/hwcontext_cuda.h +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:4878f46347271bc7a9ff26bb1573449a99cc81447684e1034a3edd4b0ff91d9a -size 1843 diff --git a/third_party/ffmpeg/include/libavutil/hwcontext_d3d11va.h b/third_party/ffmpeg/include/libavutil/hwcontext_d3d11va.h deleted file mode 100644 index efdaa88006..0000000000 --- a/third_party/ffmpeg/include/libavutil/hwcontext_d3d11va.h +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:d99c1b5c5dab94c23709d4ce6cf489c2a0b4f4bd57bb04e2196371277dca5af7 -size 6669 diff --git a/third_party/ffmpeg/include/libavutil/hwcontext_drm.h b/third_party/ffmpeg/include/libavutil/hwcontext_drm.h deleted file mode 100644 index fa6732af71..0000000000 --- a/third_party/ffmpeg/include/libavutil/hwcontext_drm.h +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:b598f37f40cf1342f923c0b97784a6f2830b543868eccee046375e096fbd5f24 -size 4673 diff --git a/third_party/ffmpeg/include/libavutil/hwcontext_dxva2.h b/third_party/ffmpeg/include/libavutil/hwcontext_dxva2.h deleted file mode 100644 index d871979e67..0000000000 --- a/third_party/ffmpeg/include/libavutil/hwcontext_dxva2.h +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:73a0333b65e99675834dcb1b63a5e9339638ccc619f1a2fcba85cdd0e179ade0 -size 2411 diff --git a/third_party/ffmpeg/include/libavutil/hwcontext_mediacodec.h b/third_party/ffmpeg/include/libavutil/hwcontext_mediacodec.h deleted file mode 100644 index efee54fea8..0000000000 --- a/third_party/ffmpeg/include/libavutil/hwcontext_mediacodec.h +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:8c602859ebca906ba6e43ea548ff28821cf2886b4500b2be1deaaf2d552496d4 -size 1988 diff --git a/third_party/ffmpeg/include/libavutil/hwcontext_opencl.h b/third_party/ffmpeg/include/libavutil/hwcontext_opencl.h deleted file mode 100644 index 812b29caaf..0000000000 --- a/third_party/ffmpeg/include/libavutil/hwcontext_opencl.h +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:ad521fa2fd015cb1aba962468ca4ac176f5fc6b2c4b7be28f05e1c03d89e1b31 -size 3097 diff --git a/third_party/ffmpeg/include/libavutil/hwcontext_qsv.h b/third_party/ffmpeg/include/libavutil/hwcontext_qsv.h deleted file mode 100644 index a5053d51de..0000000000 --- a/third_party/ffmpeg/include/libavutil/hwcontext_qsv.h +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:4986f86340b8162ef2724f0e77a380b5133aaa0612749cfb836c38b4c166d20d -size 1960 diff --git a/third_party/ffmpeg/include/libavutil/hwcontext_vaapi.h b/third_party/ffmpeg/include/libavutil/hwcontext_vaapi.h deleted file mode 100644 index b205bc5fcf..0000000000 --- a/third_party/ffmpeg/include/libavutil/hwcontext_vaapi.h +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:6f6c6a5250dd0f901cdc7de8b9b3db26102719b7e056cd17500009096bfd9b39 -size 3787 diff --git a/third_party/ffmpeg/include/libavutil/hwcontext_vdpau.h b/third_party/ffmpeg/include/libavutil/hwcontext_vdpau.h deleted file mode 100644 index 8cd234bf7b..0000000000 --- a/third_party/ffmpeg/include/libavutil/hwcontext_vdpau.h +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:6c96373d9e5deb2c500004f3f55ee1d2cea0f76cdfaeabaf5a3ad3e4938e8252 -size 1360 diff --git a/third_party/ffmpeg/include/libavutil/hwcontext_videotoolbox.h b/third_party/ffmpeg/include/libavutil/hwcontext_videotoolbox.h deleted file mode 100644 index db959d5fc1..0000000000 --- a/third_party/ffmpeg/include/libavutil/hwcontext_videotoolbox.h +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:2f74c83778a0df9738abcae823412436cbbeaff8e9083281fb6f38116cb401c2 -size 3431 diff --git a/third_party/ffmpeg/include/libavutil/hwcontext_vulkan.h b/third_party/ffmpeg/include/libavutil/hwcontext_vulkan.h deleted file mode 100644 index fce1192137..0000000000 --- a/third_party/ffmpeg/include/libavutil/hwcontext_vulkan.h +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:74067b6224e8a9d60969f192fdc17f97a12ff073274f5047c380543647026760 -size 11412 diff --git a/third_party/ffmpeg/include/libavutil/imgutils.h b/third_party/ffmpeg/include/libavutil/imgutils.h deleted file mode 100644 index 9636ebc81b..0000000000 --- a/third_party/ffmpeg/include/libavutil/imgutils.h +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:b4cceea6c7b3017dea61a9fd514d7460ab13592907addb69a2e92870872207f1 -size 14819 diff --git a/third_party/ffmpeg/include/libavutil/intfloat.h b/third_party/ffmpeg/include/libavutil/intfloat.h deleted file mode 100644 index 278a2a6311..0000000000 --- a/third_party/ffmpeg/include/libavutil/intfloat.h +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:3a29e4eebc8c269cfd867b96de91d8231773d392c12a8820e46eaba96d2b4ca1 -size 1726 diff --git a/third_party/ffmpeg/include/libavutil/intreadwrite.h b/third_party/ffmpeg/include/libavutil/intreadwrite.h deleted file mode 100644 index e6ae02efbf..0000000000 --- a/third_party/ffmpeg/include/libavutil/intreadwrite.h +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:f815f4edb0fb58c0b2c7b4f4763a27ee223672fa43ef4c5c0b99fb4575b66bf7 -size 18735 diff --git a/third_party/ffmpeg/include/libavutil/lfg.h b/third_party/ffmpeg/include/libavutil/lfg.h deleted file mode 100644 index 4e9488eaa0..0000000000 --- a/third_party/ffmpeg/include/libavutil/lfg.h +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:c3bc1533172fe74870df8e37f168f28b0ff2e21bdb6a519b6555ec72710c910f -size 2541 diff --git a/third_party/ffmpeg/include/libavutil/log.h b/third_party/ffmpeg/include/libavutil/log.h deleted file mode 100644 index a3dd2c72af..0000000000 --- a/third_party/ffmpeg/include/libavutil/log.h +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:8555ad5d41f5f2fa1c7dd0dc65f2145b0517c0a414654575aade8b3968e4c408 -size 12766 diff --git a/third_party/ffmpeg/include/libavutil/lzo.h b/third_party/ffmpeg/include/libavutil/lzo.h deleted file mode 100644 index 2e7db3c19d..0000000000 --- a/third_party/ffmpeg/include/libavutil/lzo.h +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:61e89928dee9d83030adececac06aa6c1ae2aada06c5682fde52c52015c53556 -size 2048 diff --git a/third_party/ffmpeg/include/libavutil/macros.h b/third_party/ffmpeg/include/libavutil/macros.h deleted file mode 100644 index 57932eaeb0..0000000000 --- a/third_party/ffmpeg/include/libavutil/macros.h +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:b63b3a268b096f0eed1e91b821714cff334e5dc5bb34365148704393ae15321e -size 2304 diff --git a/third_party/ffmpeg/include/libavutil/mastering_display_metadata.h b/third_party/ffmpeg/include/libavutil/mastering_display_metadata.h deleted file mode 100644 index 90983df170..0000000000 --- a/third_party/ffmpeg/include/libavutil/mastering_display_metadata.h +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:9d5743a42306ac0158e26248a1281ae8be9ebfeb02e67f14e0e6ae770a543a65 -size 3944 diff --git a/third_party/ffmpeg/include/libavutil/mathematics.h b/third_party/ffmpeg/include/libavutil/mathematics.h deleted file mode 100644 index e707131c8f..0000000000 --- a/third_party/ffmpeg/include/libavutil/mathematics.h +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:64fac2eb3a42fd3788f5585ac8e65c7d5cd82711730d1f030042ba0a62fe1a62 -size 9563 diff --git a/third_party/ffmpeg/include/libavutil/md5.h b/third_party/ffmpeg/include/libavutil/md5.h deleted file mode 100644 index 33a63e05cb..0000000000 --- a/third_party/ffmpeg/include/libavutil/md5.h +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:5b42de1758d289f78b4d20c47686f443e4ea8a5a6411c0deb357f709d2ef34d7 -size 2092 diff --git a/third_party/ffmpeg/include/libavutil/mem.h b/third_party/ffmpeg/include/libavutil/mem.h deleted file mode 100644 index 5a81cd674a..0000000000 --- a/third_party/ffmpeg/include/libavutil/mem.h +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:bf9a1d8c218c38b333efb16be076c5778d31d66a0691bdd6175f171c08283d7c -size 20457 diff --git a/third_party/ffmpeg/include/libavutil/motion_vector.h b/third_party/ffmpeg/include/libavutil/motion_vector.h deleted file mode 100644 index 6c61741e5e..0000000000 --- a/third_party/ffmpeg/include/libavutil/motion_vector.h +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:dc0b0a15a638c8b91df95a418c5951ee5e787d518f22b6e3d70094922536e8bb -size 1770 diff --git a/third_party/ffmpeg/include/libavutil/murmur3.h b/third_party/ffmpeg/include/libavutil/murmur3.h deleted file mode 100644 index 353b5a763f..0000000000 --- a/third_party/ffmpeg/include/libavutil/murmur3.h +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:649258a51c4737fa19a025a489e2ac9e9b06a96eafa802f2765178c684382887 -size 3507 diff --git a/third_party/ffmpeg/include/libavutil/opt.h b/third_party/ffmpeg/include/libavutil/opt.h deleted file mode 100644 index ef2b874b26..0000000000 --- a/third_party/ffmpeg/include/libavutil/opt.h +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:4a1679c21453e4337cc7d377efaec6610340a59204c0b58fc102ab3a9da51a39 -size 37201 diff --git a/third_party/ffmpeg/include/libavutil/parseutils.h b/third_party/ffmpeg/include/libavutil/parseutils.h deleted file mode 100644 index de2f938c60..0000000000 --- a/third_party/ffmpeg/include/libavutil/parseutils.h +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:e8efed69396851f429a8258d50e9c4f0431f921687a7c31bf6db13d14f7482c3 -size 7888 diff --git a/third_party/ffmpeg/include/libavutil/pixdesc.h b/third_party/ffmpeg/include/libavutil/pixdesc.h deleted file mode 100644 index ade8e6906c..0000000000 --- a/third_party/ffmpeg/include/libavutil/pixdesc.h +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:253359c22bc051754a9ded9497a850e5296cbfd058a9b73957c23b53d7314d96 -size 16031 diff --git a/third_party/ffmpeg/include/libavutil/pixelutils.h b/third_party/ffmpeg/include/libavutil/pixelutils.h deleted file mode 100644 index 2734d292c9..0000000000 --- a/third_party/ffmpeg/include/libavutil/pixelutils.h +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:339cd6ffb6460d06401801c5dfb91ca66b9bdc028e1acc9ff4a0f447cfd3785c -size 2051 diff --git a/third_party/ffmpeg/include/libavutil/pixfmt.h b/third_party/ffmpeg/include/libavutil/pixfmt.h deleted file mode 100644 index 459bb057c9..0000000000 --- a/third_party/ffmpeg/include/libavutil/pixfmt.h +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:69104b943b1c44a54e46635be1e5da0ff6be7cd3f1af6ebc9924d4d965d0e420 -size 41556 diff --git a/third_party/ffmpeg/include/libavutil/random_seed.h b/third_party/ffmpeg/include/libavutil/random_seed.h deleted file mode 100644 index a4e8933e50..0000000000 --- a/third_party/ffmpeg/include/libavutil/random_seed.h +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:4490fd79919aadb18f765caac0c210d22cafa4d63cddcf9275e6f5bf66e2fdea -size 1889 diff --git a/third_party/ffmpeg/include/libavutil/rational.h b/third_party/ffmpeg/include/libavutil/rational.h deleted file mode 100644 index 32a39febc7..0000000000 --- a/third_party/ffmpeg/include/libavutil/rational.h +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:700422cc782acde6898522ffe1b74658b12ca22e2cfbb8f44986266216de7f21 -size 6100 diff --git a/third_party/ffmpeg/include/libavutil/rc4.h b/third_party/ffmpeg/include/libavutil/rc4.h deleted file mode 100644 index a79ce5a1b4..0000000000 --- a/third_party/ffmpeg/include/libavutil/rc4.h +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:4ea0fbee43677721ad0d846f703a785aaf9881794d1cca0bcb210241b260fc26 -size 2003 diff --git a/third_party/ffmpeg/include/libavutil/replaygain.h b/third_party/ffmpeg/include/libavutil/replaygain.h deleted file mode 100644 index 760b289ee1..0000000000 --- a/third_party/ffmpeg/include/libavutil/replaygain.h +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:4ec82edbdc4e5493fba3cae6a27566f0f15d1399ccf16e25073ffd50ba8187ea -size 1607 diff --git a/third_party/ffmpeg/include/libavutil/ripemd.h b/third_party/ffmpeg/include/libavutil/ripemd.h deleted file mode 100644 index 34cd2714a6..0000000000 --- a/third_party/ffmpeg/include/libavutil/ripemd.h +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:df9ef8c29ee31e5bd8ea299b03d51bd25fe937583793a994db53d1df2b316620 -size 2158 diff --git a/third_party/ffmpeg/include/libavutil/samplefmt.h b/third_party/ffmpeg/include/libavutil/samplefmt.h deleted file mode 100644 index c37f4ace9d..0000000000 --- a/third_party/ffmpeg/include/libavutil/samplefmt.h +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:e844d8b4a691256238d10de762a6a536ffe52995705166aee0d7f01ce79778a9 -size 10301 diff --git a/third_party/ffmpeg/include/libavutil/sha.h b/third_party/ffmpeg/include/libavutil/sha.h deleted file mode 100644 index 58b5ea658e..0000000000 --- a/third_party/ffmpeg/include/libavutil/sha.h +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:91280db6995b1b99b9e5aad0aa211a3177dc4d2841da2fea097f54964b7891fd -size 2368 diff --git a/third_party/ffmpeg/include/libavutil/sha512.h b/third_party/ffmpeg/include/libavutil/sha512.h deleted file mode 100644 index 4e62f7fb63..0000000000 --- a/third_party/ffmpeg/include/libavutil/sha512.h +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:da265152798b221706d7fe95293a0e8cd18fa2b5087bf32504a8120f10e7658f -size 2413 diff --git a/third_party/ffmpeg/include/libavutil/spherical.h b/third_party/ffmpeg/include/libavutil/spherical.h deleted file mode 100644 index 2e14e4f293..0000000000 --- a/third_party/ffmpeg/include/libavutil/spherical.h +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:18b8e559f69a9c93b251c9d3956b2aba7f47ba46ef5a7fa01f8ae858967b73da -size 7997 diff --git a/third_party/ffmpeg/include/libavutil/stereo3d.h b/third_party/ffmpeg/include/libavutil/stereo3d.h deleted file mode 100644 index 952eb6cf79..0000000000 --- a/third_party/ffmpeg/include/libavutil/stereo3d.h +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:5ece3ffb6baafd288f9f2d8747cae92b1b3985e6693fa2de6bc200173a1981b6 -size 5224 diff --git a/third_party/ffmpeg/include/libavutil/tea.h b/third_party/ffmpeg/include/libavutil/tea.h deleted file mode 100644 index 5b3094167b..0000000000 --- a/third_party/ffmpeg/include/libavutil/tea.h +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:3c1e93c566630bb4eeedad3ef3c8719bd6050081ac1c764b1fde81aba4969076 -size 2035 diff --git a/third_party/ffmpeg/include/libavutil/threadmessage.h b/third_party/ffmpeg/include/libavutil/threadmessage.h deleted file mode 100644 index 70c8112bad..0000000000 --- a/third_party/ffmpeg/include/libavutil/threadmessage.h +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:9bb242d7adc48662b947726843108aff7c34547d7a4a0d0e6f58f54a00fc4c9f -size 3910 diff --git a/third_party/ffmpeg/include/libavutil/time.h b/third_party/ffmpeg/include/libavutil/time.h deleted file mode 100644 index ef77ac592e..0000000000 --- a/third_party/ffmpeg/include/libavutil/time.h +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:40e11fa242e0585996753affb054443e78be25919b7c3063042d0aaff1656760 -size 1800 diff --git a/third_party/ffmpeg/include/libavutil/timecode.h b/third_party/ffmpeg/include/libavutil/timecode.h deleted file mode 100644 index 5b54b01bcf..0000000000 --- a/third_party/ffmpeg/include/libavutil/timecode.h +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:afd0a634b1abcb282c694ae6c43f0412fe2ccb37fb3f08433af33779ea9e572e -size 7843 diff --git a/third_party/ffmpeg/include/libavutil/timestamp.h b/third_party/ffmpeg/include/libavutil/timestamp.h deleted file mode 100644 index 828043fe81..0000000000 --- a/third_party/ffmpeg/include/libavutil/timestamp.h +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:7cfbb6640449104c473cc1bc6f78244ce97636fca294da2867cedaab868c1b8c -size 2617 diff --git a/third_party/ffmpeg/include/libavutil/tree.h b/third_party/ffmpeg/include/libavutil/tree.h deleted file mode 100644 index ca3f72fff0..0000000000 --- a/third_party/ffmpeg/include/libavutil/tree.h +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:2f8e906917612a05c138036dea7ed9f8faee5899413a523fdad4eb51711bc1e5 -size 5408 diff --git a/third_party/ffmpeg/include/libavutil/twofish.h b/third_party/ffmpeg/include/libavutil/twofish.h deleted file mode 100644 index 96cf965ab3..0000000000 --- a/third_party/ffmpeg/include/libavutil/twofish.h +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:b71714336821e1c606b65620ba4b1ea47e431666be41f3174facbc51047fd814 -size 2245 diff --git a/third_party/ffmpeg/include/libavutil/tx.h b/third_party/ffmpeg/include/libavutil/tx.h deleted file mode 100644 index 223ffc4951..0000000000 --- a/third_party/ffmpeg/include/libavutil/tx.h +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:34f83ae31d074847e46579f25e3367210fbbfe1832b5315883cf4a28980ef101 -size 7140 diff --git a/third_party/ffmpeg/include/libavutil/uuid.h b/third_party/ffmpeg/include/libavutil/uuid.h deleted file mode 100644 index 3bc380c31a..0000000000 --- a/third_party/ffmpeg/include/libavutil/uuid.h +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:e669ce76a6b987e189b4d7ff62d0fd9ad6e334fa4967076cc6d912976574b646 -size 4895 diff --git a/third_party/ffmpeg/include/libavutil/version.h b/third_party/ffmpeg/include/libavutil/version.h deleted file mode 100644 index 1f0fa95e08..0000000000 --- a/third_party/ffmpeg/include/libavutil/version.h +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:fed7c6f02a873de2c7e2f7e6d24e48e747b3f5204e36d50e19b5e82358b76470 -size 4832 diff --git a/third_party/ffmpeg/include/libavutil/video_enc_params.h b/third_party/ffmpeg/include/libavutil/video_enc_params.h deleted file mode 100644 index 7ce1b57024..0000000000 --- a/third_party/ffmpeg/include/libavutil/video_enc_params.h +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:f287486c4f828f82e579f93ea98fccb98749129544f660decfa56da6f818fd57 -size 5991 diff --git a/third_party/ffmpeg/include/libavutil/video_hint.h b/third_party/ffmpeg/include/libavutil/video_hint.h deleted file mode 100644 index 46ad47b113..0000000000 --- a/third_party/ffmpeg/include/libavutil/video_hint.h +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:7c8b7768ffd03af5034a13274d1ca0cc6206b9f2c0c478400aba8a6c79ad5359 -size 3586 diff --git a/third_party/ffmpeg/include/libavutil/xtea.h b/third_party/ffmpeg/include/libavutil/xtea.h deleted file mode 100644 index 99bdc08b36..0000000000 --- a/third_party/ffmpeg/include/libavutil/xtea.h +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:2eb91f780cc4ad86095e4ebbce453475d40f4e9b8737d52bdf20a068dfafcdf0 -size 2834 diff --git a/third_party/ffmpeg/include/x264.h b/third_party/ffmpeg/include/x264.h deleted file mode 100644 index 17c5741777..0000000000 --- a/third_party/ffmpeg/include/x264.h +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:cec084bdb3cd2330800d0726bdbd99d91112df3fdb6d79f94e15ba67808b715c -size 49056 diff --git a/third_party/ffmpeg/include/x264_config.h b/third_party/ffmpeg/include/x264_config.h deleted file mode 100644 index 0b4ef0a07f..0000000000 --- a/third_party/ffmpeg/include/x264_config.h +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:81acf190604a6c03d8e44dd3a9751ea12dc4823cdff1c9f0b376faaeafe79ed2 -size 172 diff --git a/third_party/ffmpeg/larch64/lib/libavcodec.a b/third_party/ffmpeg/larch64/lib/libavcodec.a deleted file mode 100644 index 7e094e1813..0000000000 --- a/third_party/ffmpeg/larch64/lib/libavcodec.a +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:9cbbf4f95193267b3799652b8c86975642a22ad6c91b1df40e24ec602d315368 -size 2368942 diff --git a/third_party/ffmpeg/larch64/lib/libavformat.a b/third_party/ffmpeg/larch64/lib/libavformat.a deleted file mode 100644 index 0cfd4d2df4..0000000000 --- a/third_party/ffmpeg/larch64/lib/libavformat.a +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:f12e0f2a24ff87f328b4045b91d6453133588c2972a96980a05fc6339ff27eec -size 946966 diff --git a/third_party/ffmpeg/larch64/lib/libavutil.a b/third_party/ffmpeg/larch64/lib/libavutil.a deleted file mode 100644 index 0270811548..0000000000 --- a/third_party/ffmpeg/larch64/lib/libavutil.a +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:c0944c03c21379aa6c264e0e1b59538789e0a15c6c77e5ac0ef8d571cb6f5b01 -size 891284 diff --git a/third_party/ffmpeg/larch64/lib/libx264.a b/third_party/ffmpeg/larch64/lib/libx264.a deleted file mode 100644 index 5a95720c7f..0000000000 --- a/third_party/ffmpeg/larch64/lib/libx264.a +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:ceeac8654bb25feea79f64e91197e20a26fee4c2c36af6eae9f13943d8acf2c1 -size 2222366 diff --git a/third_party/ffmpeg/x86_64/lib/libavcodec.a b/third_party/ffmpeg/x86_64/lib/libavcodec.a deleted file mode 100644 index 00a4f4b48f..0000000000 --- a/third_party/ffmpeg/x86_64/lib/libavcodec.a +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:32ac488b287137c0537da1a81b3fa81e074bb79d9bf5af58185779f3dfe70070 -size 3267672 diff --git a/third_party/ffmpeg/x86_64/lib/libavformat.a b/third_party/ffmpeg/x86_64/lib/libavformat.a deleted file mode 100644 index 497fc2a34f..0000000000 --- a/third_party/ffmpeg/x86_64/lib/libavformat.a +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:53ba309c4adffc993671f4700e316fd5886f28aead91f051261ae1ffe8dbb03e -size 919414 diff --git a/third_party/ffmpeg/x86_64/lib/libavutil.a b/third_party/ffmpeg/x86_64/lib/libavutil.a deleted file mode 100644 index 0fc4523171..0000000000 --- a/third_party/ffmpeg/x86_64/lib/libavutil.a +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:e4fed041aafbd9672bfff2b8988256ebd3fd77892c4ecdef705c7b81173a3c56 -size 1022522 diff --git a/third_party/ffmpeg/x86_64/lib/libx264.a b/third_party/ffmpeg/x86_64/lib/libx264.a deleted file mode 100644 index 84b9d47425..0000000000 --- a/third_party/ffmpeg/x86_64/lib/libx264.a +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:e17625b8355736b3d5a8bf8ef49d10b8a531783b2c74d41246be7a35fdce3dff -size 3065330 diff --git a/tools/cabana/SConscript b/tools/cabana/SConscript index eb6f15817d..89be3cceb2 100644 --- a/tools/cabana/SConscript +++ b/tools/cabana/SConscript @@ -16,7 +16,7 @@ qt_libs = ['qt_util'] + base_libs cabana_env = qt_env.Clone() -cabana_libs = [widgets, cereal, messaging, visionipc, replay_lib, 'avformat', 'avcodec', 'avutil', 'x264', 'bz2', 'zstd', 'curl', 'yuv', 'usb-1.0'] + qt_libs +cabana_libs = [widgets, cereal, messaging, visionipc, replay_lib, 'avutil', 'avcodec', 'avformat', 'bz2', 'zstd', 'curl', 'yuv', 'usb-1.0'] + qt_libs opendbc_path = '-DOPENDBC_FILE_PATH=\'"%s"\'' % (cabana_env.Dir("../../opendbc/dbc").abspath) cabana_env['CXXFLAGS'] += [opendbc_path] diff --git a/tools/install_ubuntu_dependencies.sh b/tools/install_ubuntu_dependencies.sh index 6abc10c8e8..f33569704a 100755 --- a/tools/install_ubuntu_dependencies.sh +++ b/tools/install_ubuntu_dependencies.sh @@ -32,6 +32,12 @@ function install_ubuntu_common_requirements() { libcurl4-openssl-dev \ git \ git-lfs \ + ffmpeg \ + libavformat-dev \ + libavcodec-dev \ + libavdevice-dev \ + libavutil-dev \ + libavfilter-dev \ libbz2-dev \ libeigen3-dev \ libffi-dev \ diff --git a/tools/mac_setup.sh b/tools/mac_setup.sh index b5ee988cd6..19ef77e01c 100755 --- a/tools/mac_setup.sh +++ b/tools/mac_setup.sh @@ -38,6 +38,7 @@ brew "zlib" brew "capnp" brew "coreutils" brew "eigen" +brew "ffmpeg" brew "glfw" brew "libarchive" brew "libusb" diff --git a/tools/replay/SConscript b/tools/replay/SConscript index 013cf76584..136c4119f6 100644 --- a/tools/replay/SConscript +++ b/tools/replay/SConscript @@ -17,7 +17,7 @@ if arch != "Darwin": replay_lib_src.append("qcom_decoder.cc") replay_lib = replay_env.Library("replay", replay_lib_src, LIBS=base_libs, FRAMEWORKS=base_frameworks) Export('replay_lib') -replay_libs = [replay_lib, 'avformat', 'avcodec', 'avutil', 'bz2', 'zstd', 'curl', 'yuv', 'ncurses', 'x264'] + base_libs +replay_libs = [replay_lib, 'avutil', 'avcodec', 'avformat', 'bz2', 'zstd', 'curl', 'yuv', 'ncurses'] + base_libs replay_env.Program("replay", ["main.cc"], LIBS=replay_libs, FRAMEWORKS=base_frameworks) if GetOption('extras'):