diff options
author | Michael Niedermayer <michaelni@gmx.at> | 2012-05-22 01:53:39 +0400 |
---|---|---|
committer | Michael Niedermayer <michaelni@gmx.at> | 2012-05-22 01:53:39 +0400 |
commit | 938adb7abcfb38ab8287e97847010479a116f78c (patch) | |
tree | 36d0bee76f90de3f425df905f603f6875d969cbb /libavformat/flvenc.c | |
parent | faa2930f191099621e03c55cca32662467d3cc15 (diff) | |
parent | 13a867a63e64c62a41b7aa31bc61ca91a5eb1cf6 (diff) |
Merge remote-tracking branch 'qatar/master'
* qatar/master:
dwt: K&R prettyprinting cosmetics
Remove libnut wrapper
fate: change name of FATE samples location environment variable
avformat: Add a flag to mark muxers that allow (non strict) monotone timestamps.
http: Factorize the code by adding http_read_header()
Conflicts:
configure
doc/APIchanges
doc/fate.texi
libavcodec/dwt.c
libavcodec/dwt.h
libavformat/Makefile
libavformat/avformat.h
libavformat/libnut.c
libavformat/matroskaenc.c
libavformat/utils.c
libavformat/version.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavformat/flvenc.c')
-rw-r--r-- | libavformat/flvenc.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/libavformat/flvenc.c b/libavformat/flvenc.c index a21d0aa166..c6d5408f6d 100644 --- 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, }; |