summaryrefslogtreecommitdiffstats
path: root/meta-multimedia/recipes-multimedia/gstreamer-0.10/gst-ffmpeg-0.10.13/0001-h264-skip-error-concealment-when-SPS-and-slices-are-.patch
diff options
context:
space:
mode:
Diffstat (limited to 'meta-multimedia/recipes-multimedia/gstreamer-0.10/gst-ffmpeg-0.10.13/0001-h264-skip-error-concealment-when-SPS-and-slices-are-.patch')
-rw-r--r--meta-multimedia/recipes-multimedia/gstreamer-0.10/gst-ffmpeg-0.10.13/0001-h264-skip-error-concealment-when-SPS-and-slices-are-.patch33
1 files changed, 0 insertions, 33 deletions
diff --git a/meta-multimedia/recipes-multimedia/gstreamer-0.10/gst-ffmpeg-0.10.13/0001-h264-skip-error-concealment-when-SPS-and-slices-are-.patch b/meta-multimedia/recipes-multimedia/gstreamer-0.10/gst-ffmpeg-0.10.13/0001-h264-skip-error-concealment-when-SPS-and-slices-are-.patch
deleted file mode 100644
index 5d45c1a96..000000000
--- a/meta-multimedia/recipes-multimedia/gstreamer-0.10/gst-ffmpeg-0.10.13/0001-h264-skip-error-concealment-when-SPS-and-slices-are-.patch
+++ /dev/null
@@ -1,33 +0,0 @@
1gst-ffmpeg: h264: skip error concealment when SPS and slices are
2 mismatching
3
4Fixes out of array accesses
5
6Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
7Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
8(cherry picked from commit 695af8eed642ff0104834495652d1ee784a4c14d)
9
10Upstream-Status: Backport
11
12Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
13Signed-off-by: Yue Tao <yue.tao@windriver.com>
14---
15 libavcodec/h264.c | 2 +-
16 1 files changed, 1 insertions(+), 1 deletions(-)
17
18diff --git a/libavcodec/h264.c b/libavcodec/h264.c
19index da144db..0aab4e7 100644
20--- a/gst-libs/ext/libav/libavcodec/h264.c
21+++ b/gst-libs/ext/libav/libavcodec/h264.c
22@@ -2351,7 +2351,7 @@ static int field_end(H264Context *h, int in_setup)
23 * past end by one (callers fault) and resync_mb_y != 0
24 * causes problems for the first MB line, too.
25 */
26- if (!FIELD_PICTURE)
27+ if (!FIELD_PICTURE && h->current_slice && !h->sps.new)
28 ff_er_frame_end(s);
29
30 ff_MPV_frame_end(s);
31--
321.7.5.4
33