From 33fddfa4a29e43dd0647b8083e3c0b933127bad7 Mon Sep 17 00:00:00 2001 From: Stephan Raue Date: Mon, 9 Sep 2013 18:05:02 +0200 Subject: [PATCH] ffmpeg: add some upstream patches Signed-off-by: Stephan Raue --- ...discard_NAL_SEI_when_skipping_frames.patch | 13 +++++++++ ...discard_NAL_SEI_when_skipping_frames.patch | 27 +++++++++++++++++++ 2 files changed, 40 insertions(+) create mode 100644 packages/multimedia/ffmpeg/patches/0.10.7/ffmpeg-0.10.6-913-h264-do_not_discard_NAL_SEI_when_skipping_frames.patch create mode 100644 packages/multimedia/ffmpeg/patches/1.2.1/ffmpeg-913-h264-do_not_discard_NAL_SEI_when_skipping_frames.patch diff --git a/packages/multimedia/ffmpeg/patches/0.10.7/ffmpeg-0.10.6-913-h264-do_not_discard_NAL_SEI_when_skipping_frames.patch b/packages/multimedia/ffmpeg/patches/0.10.7/ffmpeg-0.10.6-913-h264-do_not_discard_NAL_SEI_when_skipping_frames.patch new file mode 100644 index 0000000000..db07070c34 --- /dev/null +++ b/packages/multimedia/ffmpeg/patches/0.10.7/ffmpeg-0.10.6-913-h264-do_not_discard_NAL_SEI_when_skipping_frames.patch @@ -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: diff --git a/packages/multimedia/ffmpeg/patches/1.2.1/ffmpeg-913-h264-do_not_discard_NAL_SEI_when_skipping_frames.patch b/packages/multimedia/ffmpeg/patches/1.2.1/ffmpeg-913-h264-do_not_discard_NAL_SEI_when_skipping_frames.patch new file mode 100644 index 0000000000..7b9d7c6be5 --- /dev/null +++ b/packages/multimedia/ffmpeg/patches/1.2.1/ffmpeg-913-h264-do_not_discard_NAL_SEI_when_skipping_frames.patch @@ -0,0 +1,27 @@ +From 615c1fe2ff904cdb9ebcd8edc0b2c42c3cd6218c Mon Sep 17 00:00:00 2001 +From: Rainer Hochecker +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 +