MrBesen
/
ffmpeg
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

avcodec/av1_frame_merge_bsf: Passthrough pos in case of no timestamps 

This is needed by the AV1-Annex B and AV1-OBU demuxers.

Reviewed-by: James Almer <jamrial@gmail.com>
Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@outlook.com>
This commit is contained in:
Andreas Rheinhardt 2021-08-22 07:55:34 +02:00
parent 172116fd5d
commit 5a3385d49a
1 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
libavcodec/av1_frame_merge_bsf.c
View File

@ -103,10 +103,15 @@ eof:
err = AVERROR(EAGAIN);
}
// Buffer packets with timestamps. There should be at most one per TU, be it split or not.
if (!buffer_pkt->data && in->pts != AV_NOPTS_VALUE)
/* Buffer packets with timestamps (there should be at most one per TU)
* or any packet if buffer_pkt is empty. The latter is needed to
* passthrough positions in case there are no timestamps like with
* the raw OBU demuxer. */
if (!buffer_pkt->data ||
in->pts != AV_NOPTS_VALUE && buffer_pkt->pts == AV_NOPTS_VALUE) {
av_packet_unref(buffer_pkt);
av_packet_move_ref(buffer_pkt, in);
else
} else
av_packet_unref(in);
ff_cbs_fragment_reset(&ctx->frag[ctx->idx]);