summaryrefslogtreecommitdiff
path: root/ffmpeg.c
diff options
context:
space:
mode:
authorRonald S. Bultje <rsbultje@gmail.com>2016-02-29 09:43:07 -0500
committerRonald S. Bultje <rsbultje@gmail.com>2016-03-11 11:19:14 -0500
commit2e6636aa87303d37b112e79f093ca39500f92364 (patch)
tree27e543b4779c1519781ad18824ea0d1f36491e59 /ffmpeg.c
parent6d8ab358a3c2a8fbdd6ae7f144893b7c88c30557 (diff)
vp9: add superframe merging bitstream filter.
Fixes ticket 4313.
Diffstat (limited to 'ffmpeg.c')
-rw-r--r--ffmpeg.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/ffmpeg.c b/ffmpeg.c
index 25c9140a52..9a14294768 100644
--- a/ffmpeg.c
+++ b/ffmpeg.c
@@ -712,6 +712,7 @@ static void write_frame(AVFormatContext *s, AVPacket *pkt, OutputStream *ost)
if(
(avctx->codec_type == AVMEDIA_TYPE_AUDIO || avctx->codec_type == AVMEDIA_TYPE_VIDEO) &&
pkt->dts != AV_NOPTS_VALUE &&
+ !(avctx->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) {