aboutsummaryrefslogtreecommitdiff
path: root/lib/ffmpeg/libavcodec
diff options
context:
space:
mode:
authorRainer Hochecker <fernetmenta@online.de>2013-09-09 12:13:15 +0200
committerRainer Hochecker <fernetmenta@online.de>2013-09-09 12:19:12 +0200
commitab433b250ef3eb74a09be37612e806328451be65 (patch)
treee430a36eaa7c6e719db7bdb4aa313842920255d9 /lib/ffmpeg/libavcodec
parent4e32a8446e13ecf13731eecbf45fb461147903e1 (diff)
ffmpeg backport: h264: do not discard NAL_SEI when skipping frames
Diffstat (limited to 'lib/ffmpeg/libavcodec')
-rw-r--r--lib/ffmpeg/libavcodec/h264.c3
1 files changed, 1 insertions, 2 deletions
diff --git a/lib/ffmpeg/libavcodec/h264.c b/lib/ffmpeg/libavcodec/h264.c
index 85f2372e2e..1cab49f084 100644
--- a/lib/ffmpeg/libavcodec/h264.c
+++ b/lib/ffmpeg/libavcodec/h264.c
@@ -4523,8 +4523,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: