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/wav.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/wav.c')
| -rw-r--r-- | libavformat/wav.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/libavformat/wav.c b/libavformat/wav.c index b1f1514ab5..c408623f36 100644 --- a/libavformat/wav.c +++ b/libavformat/wav.c @@ -224,6 +224,7 @@ AVOutputFormat ff_wav_muxer = { .write_header = wav_write_header, .write_packet = wav_write_packet, .write_trailer = wav_write_trailer, + .flags = AVFMT_TS_NONSTRICT, .codec_tag = (const AVCodecTag* const []){ ff_codec_wav_tags, 0 }, .priv_class = &wav_muxer_class, }; |