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/utils.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/utils.c')
-rw-r--r-- | libavformat/utils.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/libavformat/utils.c b/libavformat/utils.c index 8e4d6fcdb3..ecc5a2e880 100644 --- a/libavformat/utils.c +++ b/libavformat/utils.c @@ -3315,7 +3315,9 @@ static int compute_pkt_fields2(AVFormatContext *s, AVStream *st, AVPacket *pkt){ pkt->dts= st->pts_buffer[0]; } - if(st->cur_dts && st->cur_dts != AV_NOPTS_VALUE && ((!(s->oformat->flags & AVFMT_TS_NONSTRICT) && st->cur_dts >= pkt->dts) || st->cur_dts > pkt->dts)){ + if (st->cur_dts && st->cur_dts != AV_NOPTS_VALUE && + ((!(s->oformat->flags & AVFMT_TS_NONSTRICT) && + st->cur_dts >= pkt->dts) || st->cur_dts > pkt->dts)) { av_log(s, AV_LOG_ERROR, "Application provided invalid, non monotonically increasing dts to muxer in stream %d: %s >= %s\n", st->index, av_ts2str(st->cur_dts), av_ts2str(pkt->dts)); |