summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--meta/recipes-multimedia/gstreamer/gst-ffmpeg-0.10.13/0001-roqvideodec-check-dimensions-validity.patch36
-rw-r--r--meta/recipes-multimedia/gstreamer/gst-ffmpeg_0.10.13.bb1
2 files changed, 37 insertions, 0 deletions
diff --git a/meta/recipes-multimedia/gstreamer/gst-ffmpeg-0.10.13/0001-roqvideodec-check-dimensions-validity.patch b/meta/recipes-multimedia/gstreamer/gst-ffmpeg-0.10.13/0001-roqvideodec-check-dimensions-validity.patch
new file mode 100644
index 0000000000..7e58afcf6b
--- /dev/null
+++ b/meta/recipes-multimedia/gstreamer/gst-ffmpeg-0.10.13/0001-roqvideodec-check-dimensions-validity.patch
@@ -0,0 +1,36 @@
1From 391e0fc6c90ced6656b74f50f3a487b6dc76ea63 Mon Sep 17 00:00:00 2001
2From: Michael Niedermayer <michaelni@gmx.at>
3Date: Thu, 29 Nov 2012 15:18:17 +0100
4Subject: [PATCH] roqvideodec: check dimensions validity
5
6Upstream-Status: Backport
7
8Commit 391e0fc6c90ced6656b74f50f3a487b6dc76ea63 release/0.7
9
10Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
11Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
12(cherry picked from commit 3ae610451170cd5a28b33950006ff0bd23036845)
13
14Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
15---
16 libavcodec/roqvideodec.c | 6 ++++++
17 1 file changed, 6 insertions(+)
18
19diff --git a/libavcodec/roqvideodec.c b/libavcodec/roqvideodec.c
20index f0977f6..4e34231 100644
21--- a/gst-libs/ext/libav/libavcodec/roqvideodec.c
22+++ b/gst-libs/ext/libav/libavcodec/roqvideodec.c
23@@ -157,6 +157,12 @@ static av_cold int roq_decode_init(AVCodecContext *avctx)
24 RoqContext *s = avctx->priv_data;
25
26 s->avctx = avctx;
27+
28+ if (avctx->width%16 || avctx->height%16) {
29+ av_log_ask_for_sample(avctx, "dimensions not being a multiple of 16 are unsupported\n");
30+ return AVERROR_PATCHWELCOME;
31+ }
32+
33 s->width = avctx->width;
34 s->height = avctx->height;
35 avcodec_get_frame_defaults(&s->frames[0]);
36--
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 ad85fa2e9f..a3b2f5cf29 100644
--- a/meta/recipes-multimedia/gstreamer/gst-ffmpeg_0.10.13.bb
+++ b/meta/recipes-multimedia/gstreamer/gst-ffmpeg_0.10.13.bb
@@ -35,6 +35,7 @@ SRC_URI = "http://gstreamer.freedesktop.org/src/${BPN}/${BPN}-${PV}.tar.bz2 \
35 file://0001-mjpegdec-check-SE.patch \ 35 file://0001-mjpegdec-check-SE.patch \
36 file://0001-alac-fix-nb_samples-order-case.patch \ 36 file://0001-alac-fix-nb_samples-order-case.patch \
37 file://0001-h264-correct-ref-count-check-and-limit-fix-out-of-ar.patch \ 37 file://0001-h264-correct-ref-count-check-and-limit-fix-out-of-ar.patch \
38 file://0001-roqvideodec-check-dimensions-validity.patch \
38" 39"
39 40
40SRC_URI[md5sum] = "7f5beacaf1312db2db30a026b36888c4" 41SRC_URI[md5sum] = "7f5beacaf1312db2db30a026b36888c4"