projects
/
platform
/
upstream
/
libav.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
2617996
)
h264: log extradata skip only for non-ignored NALs
author
Vittorio Giovara
<vittorio.giovara@gmail.com>
Fri, 20 Sep 2013 13:42:41 +0000
(15:42 +0200)
committer
Anton Khirnov
<anton@khirnov.net>
Tue, 24 Sep 2013 11:24:28 +0000
(13:24 +0200)
Signed-off-by: Anton Khirnov <anton@khirnov.net>
libavcodec/h264.c
patch
|
blob
|
history
diff --git
a/libavcodec/h264.c
b/libavcodec/h264.c
index 9d012c5517d8d06029d6f36245fa1b68769a7cbd..323d1916a0bf899f1e2ffba862c5dd2fc97d10b9 100644
(file)
--- 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;