From b1d823b095af346347f27ff2414071b8672e5287 Mon Sep 17 00:00:00 2001 From: Stephan Raue Date: Thu, 6 Dec 2012 23:22:09 +0100 Subject: [PATCH] ffmpeg: add uptstream patch, this fixes #1557 Signed-off-by: Stephan Raue --- .../patches/ffmpeg-0.10.6-999-24c62ea.patch | 27 +++++++++++++++++++ 1 file changed, 27 insertions(+) create mode 100644 packages/multimedia/ffmpeg/patches/ffmpeg-0.10.6-999-24c62ea.patch diff --git a/packages/multimedia/ffmpeg/patches/ffmpeg-0.10.6-999-24c62ea.patch b/packages/multimedia/ffmpeg/patches/ffmpeg-0.10.6-999-24c62ea.patch new file mode 100644 index 0000000000..8d3d920f28 --- /dev/null +++ b/packages/multimedia/ffmpeg/patches/ffmpeg-0.10.6-999-24c62ea.patch @@ -0,0 +1,27 @@ +From 24c62ea7a5df44804be88150aa0c45e6796b5da9 Mon Sep 17 00:00:00 2001 +From: Janne Grunau +Date: Wed, 5 Dec 2012 19:56:36 +0100 +Subject: [PATCH] h264: slice-mt: get last_pic_dropable from master context + +Fixes fate-h264-conformance-cvnlfi2_sony_h and smllwebdl.mkv from +https://github.com/OpenELEC/OpenELEC.tv/issues/1557 . +--- + libavcodec/h264.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/libavcodec/h264.c b/libavcodec/h264.c +index 618acb7..a93d07e 100644 +--- a/libavcodec/h264.c ++++ b/libavcodec/h264.c +@@ -2682,7 +2682,7 @@ static int decode_slice_header(H264Context *h, H264Context *h0) + h->mb_mbaff = 0; + h->mb_aff_frame = 0; + last_pic_structure = s0->picture_structure; +- last_pic_dropable = s->dropable; ++ last_pic_dropable = s0->dropable; + s->dropable = h->nal_ref_idc == 0; + if (h->sps.frame_mbs_only_flag) { + s->picture_structure = PICT_FRAME; +-- +1.7.10 +