diff options
| -rw-r--r-- | ffmpeg_opt.c | 2 | ||||
| -rw-r--r-- | libavformat/mpegenc.c | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/ffmpeg_opt.c b/ffmpeg_opt.c index c01ef42571..63e3de959f 100644 --- a/ffmpeg_opt.c +++ b/ffmpeg_opt.c @@ -1922,8 +1922,6 @@ static int opt_target(void *optctx, const char *opt, const char *arg) av_dict_set(&o->g->codec_opts, "b:a", "448000", 0); parse_option(o, "ar", "48000", options); - av_dict_set(&o->g->format_opts, "avoid_negative_ts", "1", 0); - } else if (!strncmp(arg, "dv", 2)) { parse_option(o, "f", "dv", options); diff --git a/libavformat/mpegenc.c b/libavformat/mpegenc.c index 5d2757adba..ef8d7621ee 100644 --- a/libavformat/mpegenc.c +++ b/libavformat/mpegenc.c @@ -1062,7 +1062,9 @@ static int mpeg_mux_write_packet(AVFormatContext *ctx, AVPacket *pkt) dts= pkt->dts; if (s->last_scr == AV_NOPTS_VALUE) { - if (dts == AV_NOPTS_VALUE ) { + if (dts == AV_NOPTS_VALUE || s->is_dvd) { + if (dts != AV_NOPTS_VALUE) + s->preload += av_rescale(-dts, AV_TIME_BASE, 90000); s->last_scr = 0; } else { s->last_scr = dts + preload; |