diff options
author | takeshi_hoshina <takeshi_hoshina@mail.toyota.co.jp> | 2020-11-02 11:07:33 +0900 |
---|---|---|
committer | takeshi_hoshina <takeshi_hoshina@mail.toyota.co.jp> | 2020-11-02 11:07:33 +0900 |
commit | 1c7d6584a7811b7785ae5c1e378f14b5ba0971cf (patch) | |
tree | cd70a267a5ef105ba32f200aa088e281fbd85747 /external/poky/meta/recipes-multimedia/ffmpeg | |
parent | 4204309872da5cb401cbb2729d9e2d4869a87f42 (diff) |
basesystem-jjsandbox/ToshikazuOhiwa/master-jj
recipes
Diffstat (limited to 'external/poky/meta/recipes-multimedia/ffmpeg')
-rw-r--r-- | external/poky/meta/recipes-multimedia/ffmpeg/ffmpeg/CVE-2018-15822.patch | 37 | ||||
-rw-r--r-- | external/poky/meta/recipes-multimedia/ffmpeg/ffmpeg_4.2.2.bb (renamed from external/poky/meta/recipes-multimedia/ffmpeg/ffmpeg_4.0.2.bb) | 32 |
2 files changed, 17 insertions, 52 deletions
diff --git a/external/poky/meta/recipes-multimedia/ffmpeg/ffmpeg/CVE-2018-15822.patch b/external/poky/meta/recipes-multimedia/ffmpeg/ffmpeg/CVE-2018-15822.patch deleted file mode 100644 index 7d5868a7..00000000 --- a/external/poky/meta/recipes-multimedia/ffmpeg/ffmpeg/CVE-2018-15822.patch +++ /dev/null @@ -1,37 +0,0 @@ -From 6b67d7f05918f7a1ee8fc6ff21355d7e8736aa10 Mon Sep 17 00:00:00 2001 -From: Michael Niedermayer <michael@niedermayer.cc> -Date: Sat, 28 Jul 2018 15:03:50 +0200 -Subject: [PATCH] avformat/flvenc: Check audio packet size - -Fixes: Assertion failure -Fixes: assert_flvenc.c:941_1.swf - -Upstream-Status: Backport [https://github.com/FFmpeg/FFmpeg/commit/6b67d7f05918f7a1ee8fc6ff21355d7e8736aa10] -CVE: CVE-2018-15822 - -Found-by: #CHEN HONGXU# <HCHEN017@e.ntu.edu.sg> -Signed-off-by: Michael Niedermayer <michael@niedermayer.cc> -Signed-off-by: Mingli Yu <Mingli.Yu@windriver.com> ---- - libavformat/flvenc.c | 5 +++++ - 1 file changed, 5 insertions(+) - -diff --git a/libavformat/flvenc.c b/libavformat/flvenc.c -index 1c552a3e6b..e4863f1fc7 100644 ---- a/libavformat/flvenc.c -+++ b/libavformat/flvenc.c -@@ -883,6 +883,11 @@ static int flv_write_packet(AVFormatContext *s, AVPacket *pkt) - int flags = -1, flags_size, ret; - int64_t cur_offset = avio_tell(pb); - -+ if (par->codec_type == AVMEDIA_TYPE_AUDIO && !pkt->size) { -+ av_log(s, AV_LOG_WARNING, "Empty audio Packet\n"); -+ return AVERROR(EINVAL); -+ } -+ - if (par->codec_id == AV_CODEC_ID_VP6F || par->codec_id == AV_CODEC_ID_VP6A || - par->codec_id == AV_CODEC_ID_VP6 || par->codec_id == AV_CODEC_ID_AAC) - flags_size = 2; --- -2.17.1 - diff --git a/external/poky/meta/recipes-multimedia/ffmpeg/ffmpeg_4.0.2.bb b/external/poky/meta/recipes-multimedia/ffmpeg/ffmpeg_4.2.2.bb index 7d1af040..d7b06410 100644 --- a/external/poky/meta/recipes-multimedia/ffmpeg/ffmpeg_4.0.2.bb +++ b/external/poky/meta/recipes-multimedia/ffmpeg/ffmpeg_4.2.2.bb @@ -25,10 +25,9 @@ LIC_FILES_CHKSUM = "file://COPYING.GPLv2;md5=b234ee4d69f5fce4486a80fdaf4a4263 \ SRC_URI = "https://www.ffmpeg.org/releases/${BP}.tar.xz \ file://mips64_cpu_detection.patch \ - file://CVE-2018-15822.patch \ " -SRC_URI[md5sum] = "ae0bfdf809306a212b4f0e6eb8d1c75e" -SRC_URI[sha256sum] = "a95c0cc9eb990e94031d2183f2e6e444cc61c99f6f182d1575c433d62afb2f97" +SRC_URI[md5sum] = "348956fc2faa57a2f79bbb84ded9fbc3" +SRC_URI[sha256sum] = "cb754255ab0ee2ea5f66f8850e1bd6ad5cac1cd855d0a2f4990fb8c668b0d29c" # Build fails when thumb is enabled: https://bugzilla.yoctoproject.org/show_bug.cgi?id=7717 ARM_INSTRUCTION_SET_armv4 = "arm" @@ -39,13 +38,13 @@ ARM_INSTRUCTION_SET_armv6 = "arm" # libpostproc was previously packaged from a separate recipe PROVIDES = "libav libpostproc" -DEPENDS = "alsa-lib zlib libogg nasm-native" +DEPENDS = "nasm-native" inherit autotools pkgconfig -PACKAGECONFIG ??= "avdevice avfilter avcodec avformat swresample swscale postproc \ - bzlib gpl lzma theora x264 \ - ${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'xv', '', d)}" +PACKAGECONFIG ??= "avdevice avfilter avcodec avformat swresample swscale postproc avresample \ + alsa bzlib gpl lzma theora x264 zlib \ + ${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'xv xcb', '', d)}" # libraries to build in addition to avutil PACKAGECONFIG[avdevice] = "--enable-avdevice,--disable-avdevice" @@ -58,22 +57,28 @@ PACKAGECONFIG[postproc] = "--enable-postproc,--disable-postproc" PACKAGECONFIG[avresample] = "--enable-avresample,--disable-avresample" # features to support +PACKAGECONFIG[alsa] = "--enable-alsa,--disable-alsa,alsa-lib" PACKAGECONFIG[bzlib] = "--enable-bzlib,--disable-bzlib,bzip2" +PACKAGECONFIG[fdk-aac] = "--enable-libfdk-aac --enable-nonfree,--disable-libfdk-aac,fdk-aac" PACKAGECONFIG[gpl] = "--enable-gpl,--disable-gpl" PACKAGECONFIG[gsm] = "--enable-libgsm,--disable-libgsm,libgsm" PACKAGECONFIG[jack] = "--enable-indev=jack,--disable-indev=jack,jack" PACKAGECONFIG[libvorbis] = "--enable-libvorbis,--disable-libvorbis,libvorbis" PACKAGECONFIG[lzma] = "--enable-lzma,--disable-lzma,xz" +PACKAGECONFIG[mfx] = "--enable-libmfx,--disable-libmfx,intel-mediasdk" PACKAGECONFIG[mp3lame] = "--enable-libmp3lame,--disable-libmp3lame,lame" PACKAGECONFIG[openssl] = "--enable-openssl,--disable-openssl,openssl" PACKAGECONFIG[sdl2] = "--enable-sdl2,--disable-sdl2,virtual/libsdl2" PACKAGECONFIG[speex] = "--enable-libspeex,--disable-libspeex,speex" -PACKAGECONFIG[theora] = "--enable-libtheora,--disable-libtheora,libtheora" +PACKAGECONFIG[theora] = "--enable-libtheora,--disable-libtheora,libtheora libogg" PACKAGECONFIG[vaapi] = "--enable-vaapi,--disable-vaapi,libva" PACKAGECONFIG[vdpau] = "--enable-vdpau,--disable-vdpau,libvdpau" PACKAGECONFIG[vpx] = "--enable-libvpx,--disable-libvpx,libvpx" PACKAGECONFIG[x264] = "--enable-libx264,--disable-libx264,x264" +PACKAGECONFIG[x265] = "--enable-libx265,--disable-libx265,x265" +PACKAGECONFIG[xcb] = "--enable-libxcb,--disable-libxcb,libxcb" PACKAGECONFIG[xv] = "--enable-outdev=xv,--disable-outdev=xv,libxv" +PACKAGECONFIG[zlib] = "--enable-zlib,--disable-zlib,zlib" # Check codecs that require --enable-nonfree USE_NONFREE = "${@bb.utils.contains_any('PACKAGECONFIG', [ 'openssl' ], 'yes', '', d)}" @@ -89,10 +94,6 @@ EXTRA_OECONF = " \ --enable-pic \ --enable-shared \ --enable-pthreads \ - --disable-libxcb \ - --disable-libxcb-shm \ - --disable-libxcb-xfixes \ - --disable-libxcb-shape \ ${@bb.utils.contains('USE_NONFREE', 'yes', '--enable-nonfree', '', d)} \ \ --cross-prefix=${TARGET_PREFIX} \ @@ -103,10 +104,9 @@ EXTRA_OECONF = " \ --arch=${TARGET_ARCH} \ --target-os="linux" \ --enable-cross-compile \ - --extra-cflags="${TARGET_CFLAGS} ${HOST_CC_ARCH}${TOOLCHAIN_OPTIONS}" \ - --extra-ldflags="${TARGET_LDFLAGS}" \ + --extra-cflags="${CFLAGS} ${HOST_CC_ARCH}${TOOLCHAIN_OPTIONS}" \ + --extra-ldflags="${LDFLAGS}" \ --sysroot="${STAGING_DIR_TARGET}" \ - --enable-hardcoded-tables \ ${EXTRA_FFCONF} \ --libdir=${libdir} \ --shlibdir=${libdir} \ @@ -122,6 +122,8 @@ EXTRA_OECONF_append_linux-gnux32 = " --disable-asm" LDFLAGS_append_x86 = "${@bb.utils.contains('DISTRO_FEATURES', 'ld-is-gold', ' -fuse-ld=bfd ', '', d)}" +EXTRA_OEMAKE = "V=1" + do_configure() { ${S}/configure ${EXTRA_OECONF} } |