fftools/ffmpeg: merge DemuxPktData into FrameData

This way we can propagate arbitrary data from the demuxer all the way
into the muxer, using a single struct.
This commit is contained in:
Anton Khirnov
2023-11-24 09:49:37 +01:00
parent 5475f665f6
commit c9f38210fc
4 changed files with 33 additions and 21 deletions

View File

@@ -328,14 +328,13 @@ static int ist_dts_update(DemuxStream *ds, AVPacket *pkt)
av_assert0(!pkt->opaque_ref);
if (ds->streamcopy_needed) {
DemuxPktData *pd;
FrameData *fd;
pkt->opaque_ref = av_buffer_allocz(sizeof(*pd));
if (!pkt->opaque_ref)
fd = packet_data(pkt);
if (!fd)
return AVERROR(ENOMEM);
pd = (DemuxPktData*)pkt->opaque_ref->data;
pd->dts_est = ds->dts;
fd->dts_est = ds->dts;
}
return 0;