diff options
author | Koen Kooi <koen@dominion.thruhere.net> | 2015-04-09 11:09:52 +0200 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2015-04-10 18:10:25 +0100 |
commit | d275504b0060811ebd1f2914db1831d7099f8703 (patch) | |
tree | 6c4b9cd2da8c19bb1fc744fe4242678ad65ec392 | |
parent | 915712d527d1eacee24196614da249667d129dba (diff) | |
download | poky-d275504b0060811ebd1f2914db1831d7099f8703.tar.gz |
gst-ffmpeg: remove bogus patch that leads to build failures
'0001-huffyuvdec-check-width-more-completely-avoid-out-of-.patch'
patches the internal copy of ffmpeg with a hunk that generates a compile
failure because AV_PIX_FMT_YUV422P is undefined.
(From OE-Core rev: 3657e0fc2cd48a08035c7a0ab4da7e6666d2d91d)
Signed-off-by: Koen Kooi <koen@dominion.thruhere.net>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r-- | meta/recipes-multimedia/gstreamer/gst-ffmpeg-0.10.13/0001-huffyuvdec-check-width-more-completely-avoid-out-of-.patch | 30 | ||||
-rw-r--r-- | meta/recipes-multimedia/gstreamer/gst-ffmpeg_0.10.13.bb | 1 |
2 files changed, 0 insertions, 31 deletions
diff --git a/meta/recipes-multimedia/gstreamer/gst-ffmpeg-0.10.13/0001-huffyuvdec-check-width-more-completely-avoid-out-of-.patch b/meta/recipes-multimedia/gstreamer/gst-ffmpeg-0.10.13/0001-huffyuvdec-check-width-more-completely-avoid-out-of-.patch deleted file mode 100644 index 6b60d163fb..0000000000 --- a/meta/recipes-multimedia/gstreamer/gst-ffmpeg-0.10.13/0001-huffyuvdec-check-width-more-completely-avoid-out-of-.patch +++ /dev/null | |||
@@ -1,30 +0,0 @@ | |||
1 | gst-ffmpeg: huffyuvdec: check width more completely, avoid out of array | ||
2 | accesses | ||
3 | |||
4 | Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind | ||
5 | |||
6 | Upstream-Status: Backport | ||
7 | |||
8 | Signed-off-by: Michael Niedermayer <michaelni@gmx.at> | ||
9 | --- | ||
10 | libavcodec/huffyuv.c | 5 ++++- | ||
11 | 1 files changed, 4 insertions(+), 1 deletions(-) | ||
12 | |||
13 | diff --git a/libavcodec/huffyuv.c b/libavcodec/huffyuv.c | ||
14 | index 6e88114..ca5bcd8 100644 | ||
15 | --- a/gst-libs/ext/libav/libavcodec/huffyuv.c | ||
16 | +++ b/gst-libs/ext/libav/libavcodec/huffyuv.c | ||
17 | @@ -526,6 +526,10 @@ s->bgr32=1; | ||
18 | assert(0); | ||
19 | } | ||
20 | |||
21 | + if (s->predictor == MEDIAN && avctx->pix_fmt == AV_PIX_FMT_YUV422P && avctx->width%4) { | ||
22 | + av_log(avctx, AV_LOG_ERROR, "width must be a multiple of 4 this colorspace and predictor\n"); | ||
23 | + return AVERROR_INVALIDDATA; | ||
24 | + } | ||
25 | alloc_temp(s); | ||
26 | |||
27 | // av_log(NULL, AV_LOG_DEBUG, "pred:%d bpp:%d hbpp:%d il:%d\n", s->predictor, s->bitstream_bpp, avctx->bits_per_coded_sample, s->interlaced); | ||
28 | -- | ||
29 | 1.7.5.4 | ||
30 | |||
diff --git a/meta/recipes-multimedia/gstreamer/gst-ffmpeg_0.10.13.bb b/meta/recipes-multimedia/gstreamer/gst-ffmpeg_0.10.13.bb index 219feaafc9..e1a13c4bd1 100644 --- a/meta/recipes-multimedia/gstreamer/gst-ffmpeg_0.10.13.bb +++ b/meta/recipes-multimedia/gstreamer/gst-ffmpeg_0.10.13.bb | |||
@@ -46,7 +46,6 @@ SRC_URI = "http://gstreamer.freedesktop.org/src/${BPN}/${BPN}-${PV}.tar.bz2 \ | |||
46 | file://0001-avcodec-rpza-Perform-pointer-advance-and-checks-befo.patch \ | 46 | file://0001-avcodec-rpza-Perform-pointer-advance-and-checks-befo.patch \ |
47 | file://gst-ffmpeg-CVE-2013-0855.patch \ | 47 | file://gst-ffmpeg-CVE-2013-0855.patch \ |
48 | file://0001-qdm2dec-fix-buffer-overflow.patch \ | 48 | file://0001-qdm2dec-fix-buffer-overflow.patch \ |
49 | file://0001-huffyuvdec-check-width-more-completely-avoid-out-of-.patch \ | ||
50 | file://0001-smackerdec-Check-that-the-last-indexes-are-within-th.patch \ | 49 | file://0001-smackerdec-Check-that-the-last-indexes-are-within-th.patch \ |
51 | file://0001-avcodec-dsputil-fix-signedness-in-sizeof-comparissio.patch \ | 50 | file://0001-avcodec-dsputil-fix-signedness-in-sizeof-comparissio.patch \ |
52 | file://0001-error-concealment-initialize-block-index.patch \ | 51 | file://0001-error-concealment-initialize-block-index.patch \ |