ffmpeg: fix broken indent/style in write_frame

pull/230/head
Clément Bœsch 8 years ago
parent be07c25896
commit 1895e3a24f
  1. 5
      ffmpeg.c

@ -718,8 +718,7 @@ static void write_frame(AVFormatContext *s, AVPacket *pkt, OutputStream *ost)
- FFMIN3(pkt->pts, pkt->dts, ost->last_mux_dts + 1)
- FFMAX3(pkt->pts, pkt->dts, ost->last_mux_dts + 1);
}
if(
(avctx->codec_type == AVMEDIA_TYPE_AUDIO || avctx->codec_type == AVMEDIA_TYPE_VIDEO) &&
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) {
@ -736,7 +735,7 @@ static void write_frame(AVFormatContext *s, AVPacket *pkt, OutputStream *ost)
av_log(s, loglevel, "changing to %"PRId64". This may result "
"in incorrect timestamps in the output file.\n",
max);
if(pkt->pts >= pkt->dts)
if (pkt->pts >= pkt->dts)
pkt->pts = FFMAX(pkt->pts, max);
pkt->dts = max;
}

Loading…
Cancel
Save