diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2012-05-21 23:53:39 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2012-05-21 23:53:39 +0200 |
| commit | 938adb7abcfb38ab8287e97847010479a116f78c (patch) | |
| tree | 36d0bee76f90de3f425df905f603f6875d969cbb /libavformat/md5enc.c | |
| parent | faa2930f191099621e03c55cca32662467d3cc15 (diff) | |
| parent | 13a867a63e64c62a41b7aa31bc61ca91a5eb1cf6 (diff) | |
| download | ffmpeg-938adb7abcfb38ab8287e97847010479a116f78c.tar.gz | |
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/md5enc.c')
| -rw-r--r-- | libavformat/md5enc.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libavformat/md5enc.c b/libavformat/md5enc.c index 7077f47840..4ea7924a34 100644 --- a/libavformat/md5enc.c +++ b/libavformat/md5enc.c @@ -104,6 +104,6 @@ AVOutputFormat ff_framemd5_muxer = { .video_codec = CODEC_ID_RAWVIDEO, .write_header = ff_framehash_write_header, .write_packet = framemd5_write_packet, - .flags = AVFMT_VARIABLE_FPS, + .flags = AVFMT_VARIABLE_FPS | AVFMT_TS_NONSTRICT, }; #endif |