diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-05-03 14:17:54 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-05-03 14:52:03 +0200 |
| commit | 2b7f595aca84d421767e9755ce81d8a621898264 (patch) | |
| tree | 4d9387b90de010612d24e872119fd53c948bb41d /ffmpeg_opt.c | |
| parent | 22dc25cb29ab7b84d6d03f56766a15b6556a7b11 (diff) | |
| parent | 76d23f40314fc1dcd74a3d470b17782cc0ee5a3a (diff) | |
| download | android_external_ffmpeg-2b7f595aca84d421767e9755ce81d8a621898264.tar.gz android_external_ffmpeg-2b7f595aca84d421767e9755ce81d8a621898264.tar.bz2 android_external_ffmpeg-2b7f595aca84d421767e9755ce81d8a621898264.zip | |
Merge remote-tracking branch 'qatar/master'
* qatar/master:
avconv: do not send non-monotonous DTS to the muxers.
Conflicts:
ffmpeg_opt.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'ffmpeg_opt.c')
| -rw-r--r-- | ffmpeg_opt.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/ffmpeg_opt.c b/ffmpeg_opt.c index b27a2c3e2c..ff80c8ab44 100644 --- a/ffmpeg_opt.c +++ b/ffmpeg_opt.c @@ -1089,6 +1089,7 @@ static OutputStream *new_output_stream(OptionsContext *o, AVFormatContext *oc, e input_streams[source_index]->discard = 0; input_streams[source_index]->st->discard = AVDISCARD_NONE; } + ost->last_mux_dts = AV_NOPTS_VALUE; return ost; } |