[FFmpeg-cvslog] h264: log extradata skip only for non-ignored NALs

Vittorio Giovara git at videolan.org
Tue Sep 24 15:36:11 CEST 2013


ffmpeg | branch: master | Vittorio Giovara <vittorio.giovara at gmail.com> | Fri Sep 20 15:42:41 2013 +0200| [edaba18021e4793116f0f266e65077578a5e742e] | committer: Anton Khirnov

h264: log extradata skip only for non-ignored NALs

Signed-off-by: Anton Khirnov <anton at khirnov.net>

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

 libavcodec/h264.c |    7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/libavcodec/h264.c b/libavcodec/h264.c
index 9d012c5..323d191 100644
--- a/libavcodec/h264.c
+++ b/libavcodec/h264.c
@@ -4559,8 +4559,11 @@ again:
                 (h->avctx->active_thread_type & FF_THREAD_FRAME) &&
                 (hx->nal_unit_type != NAL_PPS &&
                  hx->nal_unit_type != NAL_SPS)) {
-                av_log(avctx, AV_LOG_INFO, "Ignoring NAL unit %d during "
-                       "extradata parsing\n", hx->nal_unit_type);
+                if (hx->nal_unit_type < NAL_AUD ||
+                    hx->nal_unit_type > NAL_AUXILIARY_SLICE)
+                    av_log(avctx, AV_LOG_INFO,
+                           "Ignoring NAL unit %d during extradata parsing\n",
+                           hx->nal_unit_type);
                 hx->nal_unit_type = NAL_FF_IGNORE;
             }
             err = 0;



More information about the ffmpeg-cvslog mailing list