aboutsummaryrefslogtreecommitdiffstats
path: root/multimedia/libav/files
diff options
context:
space:
mode:
authorjbeich <jbeich@FreeBSD.org>2016-03-15 21:36:57 +0800
committerjbeich <jbeich@FreeBSD.org>2016-03-15 21:36:57 +0800
commite176b107da68d8e0bbd24bf8be4cc8bba5529eb1 (patch)
tree448bf642d46c2b46408b3f2461406ad610dec10c /multimedia/libav/files
parenta59e577baaecf8a100653921ebcb51ff9839f734 (diff)
downloadfreebsd-ports-gnome-e176b107da68d8e0bbd24bf8be4cc8bba5529eb1.tar.gz
freebsd-ports-gnome-e176b107da68d8e0bbd24bf8be4cc8bba5529eb1.tar.zst
freebsd-ports-gnome-e176b107da68d8e0bbd24bf8be4cc8bba5529eb1.zip
multimedia/libav: update to 11.6
As upstream ignores many FFmpeg CVE fixes I'm not adjusting VuXML to err on the side of security paranoia. Changes: https://git.libav.org/?p=libav.git;a=blob;f=Changelog;hb=refs/tags/v11.6 MFH: 2016Q1
Diffstat (limited to 'multimedia/libav/files')
-rw-r--r--multimedia/libav/files/patch-CVE-2015-547951
1 files changed, 0 insertions, 51 deletions
diff --git a/multimedia/libav/files/patch-CVE-2015-5479 b/multimedia/libav/files/patch-CVE-2015-5479
deleted file mode 100644
index aa7c191ad4cf..000000000000
--- a/multimedia/libav/files/patch-CVE-2015-5479
+++ /dev/null
@@ -1,51 +0,0 @@
-From: Luca Barbato <lu_zero@gentoo.org>
-Date: Fri, 26 Jun 2015 13:57:16 +0000 (+0200)
-Subject: h263: Always check both dimensions
-X-Git-Url: https://git.libav.org/?p=libav.git;a=commitdiff_plain;h=0a49a62f998747cfa564d98d36a459fe70d3299b;hp=6f4cd33efb5a9ec75db1677d5f7846c60337129f
-
-h263: Always check both dimensions
-
-CC: libav-stable@libav.org
-Found-By: ago@gentoo.org
----
-
-diff --git a/libavcodec/ituh263dec.c b/libavcodec/ituh263dec.c
-index b1da22f..b9189b2 100644
---- libavcodec/ituh263dec.c.orig
-+++ libavcodec/ituh263dec.c
-@@ -30,6 +30,7 @@
- #include <limits.h>
-
- #include "libavutil/attributes.h"
-+#include "libavutil/imgutils.h"
- #include "libavutil/internal.h"
- #include "libavutil/mathematics.h"
- #include "avcodec.h"
-@@ -868,7 +869,7 @@ end:
- /* most is hardcoded. should extend to handle all h263 streams */
- int ff_h263_decode_picture_header(MpegEncContext *s)
- {
-- int format, width, height, i;
-+ int format, width, height, i, ret;
- uint32_t startcode;
-
- align_get_bits(&s->gb);
-@@ -919,8 +920,6 @@ int ff_h263_decode_picture_header(MpegEncContext *s)
- /* H.263v1 */
- width = ff_h263_format[format][0];
- height = ff_h263_format[format][1];
-- if (!width)
-- return -1;
-
- s->pict_type = AV_PICTURE_TYPE_I + get_bits1(&s->gb);
-
-@@ -1073,6 +1072,9 @@ int ff_h263_decode_picture_header(MpegEncContext *s)
- s->qscale = get_bits(&s->gb, 5);
- }
-
-+ if ((ret = av_image_check_size(s->width, s->height, 0, s)) < 0)
-+ return ret;
-+
- s->mb_width = (s->width + 15) / 16;
- s->mb_height = (s->height + 15) / 16;
- s->mb_num = s->mb_width * s->mb_height;