| Message ID | 3139027.gUWHTmZQCl@komascript.de |
|---|---|
| State | Accepted |
| Commit | a790813739a880a0a86084ec8c4e2d5a6a79c11d |
| Headers | show |
2018-06-21 7:40 GMT+02:00, Markus Kohm <markus.kohm@gmx.de>: > Am Mittwoch, 20. Juni 2018, 22:54:34 CEST schrieb Michael Niedermayer: >> Please post a git compatible patch > > see attachtment This is exactly the same attachment as in your original mail... Who wrote the patch / where did you find it? Carl Eugen
On Thu, Jun 21, 2018 at 10:51:33 +0200, Carl Eugen Hoyos wrote: > This is exactly the same attachment as in your original mail... Not quite, it was a git diff this time, but obviously still not sufficient. > Who wrote the patch / where did you find it? The ticket he mentioned was #4450, the patch is here: https://trac.ffmpeg.org/ticket/4450#comment:6 (Just because I had aleady checked that out and still had that tab open. ;-)) Moritz
diff --git a/fftools/ffmpeg.c b/fftools/ffmpeg.c index 6dfab64bc7..8d311a9ac8 100644 --- a/fftools/ffmpeg.c +++ b/fftools/ffmpeg.c @@ -772,7 +772,7 @@ static void write_packet(OutputFile *of, AVPacket *pkt, OutputStream *ost, int u - FFMIN3(pkt->pts, pkt->dts, ost->last_mux_dts + 1) - FFMAX3(pkt->pts, pkt->dts, ost->last_mux_dts + 1); } - if ((st->codecpar->codec_type == AVMEDIA_TYPE_AUDIO || st->codecpar->codec_type == AVMEDIA_TYPE_VIDEO) && + 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) {
Am Mittwoch, 20. Juni 2018, 22:54:34 CEST schrieb Michael Niedermayer: > Please post a git compatible patch see attachtment