diff options
| author |   Alexis Ballier <aballier@gentoo.org> | 2018-07-18 20:01:17 +0200 |
|---|---|---|
| committer | Alexis Ballier <aballier@gentoo.org> | 2018-07-19 13:08:48 +0200 |
| commit | 2dacc4667f7237c6ab6da9039b125af8bc5fc441 (patch) | |
| tree | 30812e66c5a30ec745bfc96d014bdf100ef21b55 /media-video/ffmpeg/files | |
| parent | media-video/ffmpeg: bump to 4.0.2 (diff) | |
| download | gentoo-2dacc4667f7237c6ab6da9039b125af8bc5fc441.tar.gz gentoo-2dacc4667f7237c6ab6da9039b125af8bc5fc441.tar.bz2 gentoo-2dacc4667f7237c6ab6da9039b125af8bc5fc441.zip | |
media-video/ffmpeg: bump to 3.4.4
Package-Manager: Portage-2.3.43, Repoman-2.3.10
Diffstat (limited to 'media-video/ffmpeg/files')
| -rw-r--r-- | media-video/ffmpeg/files/imgc.patch | 29 |
1 files changed, 0 insertions, 29 deletions
diff --git a/media-video/ffmpeg/files/imgc.patch b/media-video/ffmpeg/files/imgc.patch deleted file mode 100644 index 793299ad7036..000000000000 --- a/media-video/ffmpeg/files/imgc.patch +++ /dev/null @@ -1,29 +0,0 @@ -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; - } - |