Skip to content
Browse files

Merge pull request #3208 from FernetMenta/audiostream

dvdplayer: fix accurate seek
  • Loading branch information...
2 parents ba5e5e5 + e1c11b9 commit 1b5ed564898caaf5849bc1577af2404bbf45e4ea @FernetMenta FernetMenta committed
View
3 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:
View
14 lib/ffmpeg/patches/0056-backport-h264-do-not-discard-NAL_SEI-when-skipping-frames.patch
@@ -0,0 +1,14 @@
+diff --git a/lib/ffmpeg/libavcodec/h264.c b/lib/ffmpeg/libavcodec/h264.c
+index 85f2372..1cab49f 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:

0 comments on commit 1b5ed56

Please sign in to comment.
Something went wrong with that request. Please try again.