summaryrefslogtreecommitdiffstats
path: root/meta/recipes-multimedia
diff options
context:
space:
mode:
Diffstat (limited to 'meta/recipes-multimedia')
-rw-r--r--meta/recipes-multimedia/gstreamer/gst-ffmpeg-0.10.13/0001-alac-fix-nb_samples-order-case.patch30
-rw-r--r--meta/recipes-multimedia/gstreamer/gst-ffmpeg_0.10.13.bb1
2 files changed, 31 insertions, 0 deletions
diff --git a/meta/recipes-multimedia/gstreamer/gst-ffmpeg-0.10.13/0001-alac-fix-nb_samples-order-case.patch b/meta/recipes-multimedia/gstreamer/gst-ffmpeg-0.10.13/0001-alac-fix-nb_samples-order-case.patch
new file mode 100644
index 0000000000..10ce0f332c
--- /dev/null
+++ b/meta/recipes-multimedia/gstreamer/gst-ffmpeg-0.10.13/0001-alac-fix-nb_samples-order-case.patch
@@ -0,0 +1,30 @@
1From e0884eadf6a15e93142131b695f48776f9a0ac31 Mon Sep 17 00:00:00 2001
2From: Michael Niedermayer <michaelni@gmx.at>
3Date: Sat, 10 Nov 2012 17:14:04 +0100
4Subject: [PATCH] alac: fix nb_samples < order case
5
6Upstream-Status: Backport
7
8Commit e0884eadf6a15e93142131b695f48776f9a0ac31 release/1.0
9
10Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
11Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
12(cherry picked from commit fd4f4923cce6a2cbf4f48640b4ac706e614a1594)
13---
14 libavcodec/alac.c | 2 +-
15 1 file changed, 1 insertion(+), 1 deletion(-)
16
17diff --git a/libavcodec/alac.c b/libavcodec/alac.c
18index 9cd1737..e8e844a 100644
19--- a/gst-libs/ext/libav/libavcodec/alac.c
20+++ b/gst-libs/ext/libav/libavcodec/alac.c
21@@ -278,7 +278,7 @@ static void predictor_decompress_fir_ada
22
23 /* read warm-up samples */
24 if (predictor_coef_num > 0)
25- for (i = 0; i < predictor_coef_num; i++) {
26+ for (i = 0; i < predictor_coef_num && i < output_size; i++) {
27 int32_t val;
28
29 val = buffer_out[i] + error_buffer[i+1];
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 28ea29e41b..a0673fd668 100644
--- a/meta/recipes-multimedia/gstreamer/gst-ffmpeg_0.10.13.bb
+++ b/meta/recipes-multimedia/gstreamer/gst-ffmpeg_0.10.13.bb
@@ -33,6 +33,7 @@ SRC_URI = "http://gstreamer.freedesktop.org/src/${BPN}/${BPN}-${PV}.tar.bz2 \
33 file://0001-atrac3dec-Check-coding-mode-against-channels.patch \ 33 file://0001-atrac3dec-Check-coding-mode-against-channels.patch \
34 file://0001-eamad-fix-out-of-array-accesses.patch \ 34 file://0001-eamad-fix-out-of-array-accesses.patch \
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" 37"
37 38
38SRC_URI[md5sum] = "7f5beacaf1312db2db30a026b36888c4" 39SRC_URI[md5sum] = "7f5beacaf1312db2db30a026b36888c4"