mirror of
https://github.com/LibreELEC/LibreELEC.tv.git
synced 2025-07-29 13:46:49 +00:00
ffmpeg: add some upstream patches
Signed-off-by: Stephan Raue <stephan@openelec.tv>
This commit is contained in:
parent
e7abe57121
commit
33fddfa4a2
@ -0,0 +1,13 @@
|
||||
diff -Naur ffmpeg-0.10.7/libavcodec/h264.c ffmpeg-0.10.7.patch/libavcodec/h264.c
|
||||
--- ffmpeg-0.10.7/libavcodec/h264.c 2013-04-10 03:52:33.000000000 +0200
|
||||
+++ ffmpeg-0.10.7.patch/libavcodec/h264.c 2013-09-09 17:25:55.377208927 +0200
|
||||
@@ -3962,8 +3962,7 @@
|
||||
continue;
|
||||
}
|
||||
|
||||
- //FIXME do not discard SEI id
|
||||
- if(avctx->skip_frame >= AVDISCARD_NONREF && h->nal_ref_idc == 0)
|
||||
+ if (avctx->skip_frame >= AVDISCARD_NONREF && h->nal_ref_idc == 0 && h->nal_unit_type != NAL_SEI)
|
||||
continue;
|
||||
|
||||
again:
|
@ -0,0 +1,27 @@
|
||||
From 615c1fe2ff904cdb9ebcd8edc0b2c42c3cd6218c Mon Sep 17 00:00:00 2001
|
||||
From: Rainer Hochecker <fernetmenta@online.de>
|
||||
Date: Mon, 9 Sep 2013 12:13:15 +0200
|
||||
Subject: [PATCH] ffmpeg backport: h264: do not discard NAL_SEI when skipping
|
||||
frames
|
||||
|
||||
---
|
||||
libavcodec/h264.c | 3 +--
|
||||
1 file changed, 1 insertion(+), 2 deletions(-)
|
||||
|
||||
diff --git a/libavcodec/h264.c b/libavcodec/h264.c
|
||||
index 4f09c67..62ac8fb 100644
|
||||
--- a/libavcodec/h264.c
|
||||
+++ b/libavcodec/h264.c
|
||||
@@ -4529,8 +4529,7 @@ static int decode_nal_units(H264Context *h, const uint8_t *buf, int buf_size,
|
||||
first_slice = hx->nal_unit_type;
|
||||
}
|
||||
|
||||
- // FIXME do not discard SEI id
|
||||
- if (avctx->skip_frame >= AVDISCARD_NONREF && h->nal_ref_idc == 0)
|
||||
+ if (avctx->skip_frame >= AVDISCARD_NONREF && h->nal_ref_idc == 0 && h->nal_unit_type != NAL_SEI)
|
||||
continue;
|
||||
|
||||
again:
|
||||
--
|
||||
1.8.4
|
||||
|
Loading…
x
Reference in New Issue
Block a user