Apply "Restore DTS correction for VP9 copies"

LinusCDE · LinusCDE · commit b49957d53fd5 · 2022-03-19T18:24:44.000+01:00
Applied changes from patch proposed in mailing list to fix yt-dtp conversion errors with webm/vp9 videos: http://ffmpeg.org/pipermail/ffmpeg-devel/2021-May/280189.html
diff --git a/fftools/ffmpeg.c b/fftools/ffmpeg.c
@@ -823,7 +823,6 @@ static void write_packet(OutputFile *of, AVPacket *pkt, OutputStream *ost, int u
         }
         if ((st->codecpar->codec_type == AVMEDIA_TYPE_AUDIO || st->codecpar->codec_type == AVMEDIA_TYPE_VIDEO || st->codecpar->codec_type == AVMEDIA_TYPE_SUBTITLE) &&
             pkt->dts != AV_NOPTS_VALUE &&
-            !(st->codecpar->codec_id == AV_CODEC_ID_VP9 && ost->stream_copy) &&
             ost->last_mux_dts != AV_NOPTS_VALUE) {
             int64_t max = ost->last_mux_dts + !(s->oformat->flags & AVFMT_TS_NONSTRICT);
             if (pkt->dts < max) {

Original file line number	Diff line number	Diff line change
`@@ -823,7 +823,6 @@ static void write_packet(OutputFile of, AVPacket pkt, OutputStream *ost, int u`
`823`	`823`	`}`
`824`	`824`	`if ((st->codecpar->codec_type == AVMEDIA_TYPE_AUDIO \|\| st->codecpar->codec_type == AVMEDIA_TYPE_VIDEO \|\| st->codecpar->codec_type == AVMEDIA_TYPE_SUBTITLE) &&`
`825`	`825`	`pkt->dts != AV_NOPTS_VALUE &&`
`826`		`- !(st->codecpar->codec_id == AV_CODEC_ID_VP9 && ost->stream_copy) &&`
`827`	`826`	`ost->last_mux_dts != AV_NOPTS_VALUE) {`
`828`	`827`	`int64_t max = ost->last_mux_dts + !(s->oformat->flags & AVFMT_TS_NONSTRICT);`
`829`	`828`	`if (pkt->dts < max) {`