diff options
| author |   Alexis Ballier <aballier@gentoo.org> | 2018-07-17 09:31:16 +0200 |
|---|---|---|
| committer | Alexis Ballier <aballier@gentoo.org> | 2018-07-17 09:33:25 +0200 |
| commit | 6d10649f4bd5343beaaab6c57638df2df3a3b3e7 (patch) | |
| tree | 5b3525de1c9a8a8d6da9c028c5b2ec023b402cd1 /media-video | |
| parent | media-video/ffmpeg: Remove old (diff) | |
| download | gentoo-6d10649f4bd5343beaaab6c57638df2df3a3b3e7.tar.gz gentoo-6d10649f4bd5343beaaab6c57638df2df3a3b3e7.tar.bz2 gentoo-6d10649f4bd5343beaaab6c57638df2df3a3b3e7.zip | |
media-video/ffmpeg: bp us patch to fix mpv crash regression
Closes: https://bugs.gentoo.org/661220
Package-Manager: Portage-2.3.43, Repoman-2.3.10
Diffstat (limited to 'media-video')
| -rw-r--r-- | media-video/ffmpeg/ffmpeg-3.4.3-r1.ebuild (renamed from media-video/ffmpeg/ffmpeg-3.4.3.ebuild) | 1 | ||||
| -rw-r--r-- | media-video/ffmpeg/files/imgc.patch | 29 |
2 files changed, 30 insertions, 0 deletions
diff --git a/media-video/ffmpeg/ffmpeg-3.4.3.ebuild b/media-video/ffmpeg/ffmpeg-3.4.3-r1.ebuild index aa8b226963bb..cfc053565cd7 100644 --- a/media-video/ffmpeg/ffmpeg-3.4.3.ebuild +++ b/media-video/ffmpeg/ffmpeg-3.4.3-r1.ebuild @@ -290,6 +290,7 @@ S=${WORKDIR}/${P/_/-} PATCHES=( "${FILESDIR}"/chromium.patch + "${FILESDIR}"/imgc.patch ) MULTILIB_WRAPPED_HEADERS=( diff --git a/media-video/ffmpeg/files/imgc.patch b/media-video/ffmpeg/files/imgc.patch new file mode 100644 index 000000000000..793299ad7036 --- /dev/null +++ b/media-video/ffmpeg/files/imgc.patch @@ -0,0 +1,29 @@ +commit c1e172c2e14ef059dac632f7c67f081dfecd30dc +Author: Simon Thelen <ffmpeg-dev@c-14.de> +Date: Tue Apr 3 14:41:33 2018 +0200 + + avcodec/imgconvert: fix possible null pointer dereference + + regression since 354b26a3945eadd4ed8fcd801dfefad2566241de + + (cherry picked from commit 8c2c97403baf95d0facb53f03e468f023eb943e1) + +diff --git a/libavcodec/imgconvert.c b/libavcodec/imgconvert.c +index 7b0005b308..1fd636c83d 100644 +--- a/libavcodec/imgconvert.c ++++ b/libavcodec/imgconvert.c +@@ -72,11 +72,12 @@ enum AVPixelFormat avcodec_find_best_pix_fmt_of_list(const enum AVPixelFormat *p + int loss; + + for (i=0; pix_fmt_list[i] != AV_PIX_FMT_NONE; i++) { +- loss = *loss_ptr; ++ loss = loss_ptr ? *loss_ptr : 0; + best = avcodec_find_best_pix_fmt_of_2(best, pix_fmt_list[i], src_pix_fmt, has_alpha, &loss); + } + +- *loss_ptr = loss; ++ if (loss_ptr) ++ *loss_ptr = loss; + return best; + } + |