mirror of https://git.ffmpeg.org/ffmpeg.git
Merge commit 'a833ff68f6bf9dc72c3ef0ddf830ebed743c0703'
* commit 'a833ff68f6bf9dc72c3ef0ddf830ebed743c0703': h264: Fix decoding delay for Intra only streams Merged-by: Clément Bœsch <u@pkh.me>
This commit is contained in:
commit
b4abf0e396
|
@ -560,7 +560,8 @@ int ff_h264_decode_seq_parameter_set(GetBitContext *gb, AVCodecContext *avctx,
|
||||||
|
|
||||||
/* if the maximum delay is not stored in the SPS, derive it based on the
|
/* if the maximum delay is not stored in the SPS, derive it based on the
|
||||||
* level */
|
* level */
|
||||||
if (!sps->bitstream_restriction_flag) {
|
if (!sps->bitstream_restriction_flag &&
|
||||||
|
(sps->ref_frame_count || avctx->strict_std_compliance >= FF_COMPLIANCE_STRICT)) {
|
||||||
sps->num_reorder_frames = MAX_DELAYED_PIC_COUNT - 1;
|
sps->num_reorder_frames = MAX_DELAYED_PIC_COUNT - 1;
|
||||||
for (i = 0; i < FF_ARRAY_ELEMS(level_max_dpb_mbs); i++) {
|
for (i = 0; i < FF_ARRAY_ELEMS(level_max_dpb_mbs); i++) {
|
||||||
if (level_max_dpb_mbs[i][0] == sps->level_idc) {
|
if (level_max_dpb_mbs[i][0] == sps->level_idc) {
|
||||||
|
|
Loading…
Reference in New Issue