From 66a362ee92331fa1393fbdb0c1e1b26d8f39de6a Mon Sep 17 00:00:00 2001 From: Ewout ter Hoeven Date: Mon, 11 Feb 2019 17:12:33 +0100 Subject: contrib: Update to FFmpeg 4.1.1. --- contrib/ffmpeg/A05-hevc-nonref.patch | 35 ----------------------------------- 1 file changed, 35 deletions(-) delete mode 100644 contrib/ffmpeg/A05-hevc-nonref.patch (limited to 'contrib/ffmpeg/A05-hevc-nonref.patch') diff --git a/contrib/ffmpeg/A05-hevc-nonref.patch b/contrib/ffmpeg/A05-hevc-nonref.patch deleted file mode 100644 index 8f1c7f21c..000000000 --- a/contrib/ffmpeg/A05-hevc-nonref.patch +++ /dev/null @@ -1,35 +0,0 @@ -From 11dff170ef79d26d1de2bcd13b603a6c4c5c9815 Mon Sep 17 00:00:00 2001 -From: Mark Wu -Date: Tue, 23 Oct 2018 12:49:08 +0800 -Subject: [PATCH] avcodec/hevcdec: fix non-ref frame judgement - -After inspecting the source code of x265, mpv and ffmpeg, I've found that -ffmpeg mistakenly regards EVC_NAL_BLA_N_LP and HEVC_NAL_IDR_N_LP as non- -reference frames, which are acutally reference frames according to the -specification in x265, and drops them. - -This patch should address the problem. I have tested it with mpv. - -Signed-off-by: Mark Wu -Signed-off-by: James Almer -(cherry picked from commit 10bc4c3a7df7bb26303067b97311b7eeedfd453e) ---- - libavcodec/hevcdec.h | 2 -- - 1 file changed, 2 deletions(-) - -diff --git a/libavcodec/hevcdec.h b/libavcodec/hevcdec.h -index f0f588f..dd951aa 100644 ---- a/libavcodec/hevcdec.h -+++ b/libavcodec/hevcdec.h -@@ -559,8 +559,6 @@ static av_always_inline int ff_hevc_nal_is_nonref(enum HEVCNALUnitType type) - case HEVC_NAL_VCL_N10: - case HEVC_NAL_VCL_N12: - case HEVC_NAL_VCL_N14: -- case HEVC_NAL_BLA_N_LP: -- case HEVC_NAL_IDR_N_LP: - return 1; - break; - default: break; --- -1.9.1 - -- cgit v1.2.3