diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-09-24 15:38:08 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-09-24 15:38:34 +0200 |
| commit | d195e6e410e4d8220a7751765c71ec111f89597f (patch) | |
| tree | 7b172c909e16bcce62abe3057bbe9d2aa4859963 /libavcodec | |
| parent | af2bb83dffb7a2be00a155aeba24a3312c1fb94e (diff) | |
| parent | 71cabb521ac397db3903011d2de7afd3e0fc7ab6 (diff) | |
Merge commit '71cabb521ac397db3903011d2de7afd3e0fc7ab6'
* commit '71cabb521ac397db3903011d2de7afd3e0fc7ab6':
h264: do not discard NAL_SEI when skipping frames
Conflicts:
libavcodec/h264.c
See: 7d75fb381ba774a8d2fa7de0c12140cd465c0255
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec')
| -rw-r--r-- | libavcodec/h264.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/libavcodec/h264.c b/libavcodec/h264.c index 9ebea9eed5..4af37eb470 100644 --- a/libavcodec/h264.c +++ b/libavcodec/h264.c @@ -4757,7 +4757,9 @@ static int decode_nal_units(H264Context *h, const uint8_t *buf, int buf_size, first_slice = hx->nal_unit_type; } - if (avctx->skip_frame >= AVDISCARD_NONREF && h->nal_ref_idc == 0 && h->nal_unit_type != NAL_SEI) + if (avctx->skip_frame >= AVDISCARD_NONREF && + h->nal_ref_idc == 0 && + h->nal_unit_type != NAL_SEI) continue; again: |