[FFmpeg-cvslog] h264: do not discard NAL_SEI when skipping frames

Rainer Hochecker git at videolan.org
Mon Sep 9 12:01:31 CEST 2013


ffmpeg | branch: master | Rainer Hochecker <fernetmenta at online.de> | Mon Sep  9 10:05:48 2013 +0200| [7d75fb381ba774a8d2fa7de0c12140cd465c0255] | committer: Michael Niedermayer

h264: do not discard NAL_SEI when skipping frames

Signed-off-by: Michael Niedermayer <michaelni at gmx.at>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=7d75fb381ba774a8d2fa7de0c12140cd465c0255
---

 libavcodec/h264.c |    3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/libavcodec/h264.c b/libavcodec/h264.c
index a9995bd..09898a6 100644
--- a/libavcodec/h264.c
+++ b/libavcodec/h264.c
@@ -4757,8 +4757,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:



More information about the ffmpeg-cvslog mailing list