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-09 19:48:01 +0100 |
| commit | 3657e0fc2cd48a08035c7a0ab4da7e6666d2d91d (patch) | |
| tree | cab72d1cd18265673713240942b3bed610966c95 /meta/recipes-multimedia | |
| parent | f2a45c0c1b9878319890fe03f26dd4e0db740091 (diff) | |
| download | openembedded-core-3657e0fc2cd48a08035c7a0ab4da7e6666d2d91d.tar.gz openembedded-core-3657e0fc2cd48a08035c7a0ab4da7e6666d2d91d.tar.bz2 openembedded-core-3657e0fc2cd48a08035c7a0ab4da7e6666d2d91d.zip | |
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.
Signed-off-by: Koen Kooi <koen@dominion.thruhere.net>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-multimedia')
| -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 @@ -gst-ffmpeg: huffyuvdec: check width more completely, avoid out of array - accesses - -Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind - -Upstream-Status: Backport - -Signed-off-by: Michael Niedermayer <michaelni@gmx.at> ---- - libavcodec/huffyuv.c | 5 ++++- - 1 files changed, 4 insertions(+), 1 deletions(-) - -diff --git a/libavcodec/huffyuv.c b/libavcodec/huffyuv.c -index 6e88114..ca5bcd8 100644 ---- a/gst-libs/ext/libav/libavcodec/huffyuv.c -+++ b/gst-libs/ext/libav/libavcodec/huffyuv.c -@@ -526,6 +526,10 @@ s->bgr32=1; - assert(0); - } - -+ if (s->predictor == MEDIAN && avctx->pix_fmt == AV_PIX_FMT_YUV422P && avctx->width%4) { -+ av_log(avctx, AV_LOG_ERROR, "width must be a multiple of 4 this colorspace and predictor\n"); -+ return AVERROR_INVALIDDATA; -+ } - alloc_temp(s); - - // 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); --- -1.7.5.4 - 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 \ file://0001-avcodec-rpza-Perform-pointer-advance-and-checks-befo.patch \ file://gst-ffmpeg-CVE-2013-0855.patch \ file://0001-qdm2dec-fix-buffer-overflow.patch \ - file://0001-huffyuvdec-check-width-more-completely-avoid-out-of-.patch \ file://0001-smackerdec-Check-that-the-last-indexes-are-within-th.patch \ file://0001-avcodec-dsputil-fix-signedness-in-sizeof-comparissio.patch \ file://0001-error-concealment-initialize-block-index.patch \ |