git.videolan.org
/
ffmpeg.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge remote-tracking branch 'qatar/master'
[ffmpeg.git]
/
libavformat
/
flvenc.c
diff --git
a/libavformat/flvenc.c
b/libavformat/flvenc.c
index
a21d0aa
..
c6d5408
100644
(file)
--- a/
libavformat/flvenc.c
+++ b/
libavformat/flvenc.c
@@
-520,5
+520,6
@@
AVOutputFormat ff_flv_muxer = {
.codec_tag = (const AVCodecTag* const []){
flv_video_codec_ids, flv_audio_codec_ids, 0
},
- .flags = AVFMT_GLOBALHEADER | AVFMT_VARIABLE_FPS,
+ .flags = AVFMT_GLOBALHEADER | AVFMT_VARIABLE_FPS |
+ AVFMT_TS_NONSTRICT,
};