diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-09-24 15:23:01 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-09-24 15:30:21 +0200 |
| commit | af2bb83dffb7a2be00a155aeba24a3312c1fb94e (patch) | |
| tree | 568d8867e746b321966d92dbcfc8c4d63a703e52 /libavcodec | |
| parent | 9c2e31c3b3a2a8ec9672bcda94512dd4f6ef301b (diff) | |
| parent | edaba18021e4793116f0f266e65077578a5e742e (diff) | |
Merge commit 'edaba18021e4793116f0f266e65077578a5e742e'
* commit 'edaba18021e4793116f0f266e65077578a5e742e':
h264: log extradata skip only for non-ignored NALs
Conflicts:
libavcodec/h264.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec')
| -rw-r--r-- | libavcodec/h264.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/libavcodec/h264.c b/libavcodec/h264.c index 09898a6bb7..9ebea9eed5 100644 --- a/libavcodec/h264.c +++ b/libavcodec/h264.c @@ -4771,8 +4771,11 @@ again: case NAL_DPA: case NAL_DPB: case NAL_DPC: + av_log(h->avctx, AV_LOG_WARNING, + "Ignoring NAL %d in global header/extradata\n", + hx->nal_unit_type); + // fall through to next case case NAL_AUXILIARY_SLICE: - av_log(h->avctx, AV_LOG_WARNING, "Ignoring NAL %d in global header/extradata\n", hx->nal_unit_type); hx->nal_unit_type = NAL_FF_IGNORE; } } |