diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-10-10 20:34:14 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-10-10 20:38:51 +0200 |
| commit | fc6aa304596bba3837e1026fe1fb6abba1295ab5 (patch) | |
| tree | d2f57d8321b1fe97234be0258eee47a41de01e6f | |
| parent | cb530dda7d76790b08ee3b7f67e251f3ce48c359 (diff) | |
| parent | eb4f9069002e73648f6640cd054fc814cfda75b8 (diff) | |
| download | ffmpeg-fc6aa304596bba3837e1026fe1fb6abba1295ab5.tar.gz | |
Merge commit 'eb4f9069002e73648f6640cd054fc814cfda75b8'
* commit 'eb4f9069002e73648f6640cd054fc814cfda75b8':
lavf: More informative error message
Conflicts:
libavformat/mux.c
See: 30ced7e69f434bd49b39fb7c8ce02d9ba71babfc
Merged-by: Michael Niedermayer <michaelni@gmx.at>
| -rw-r--r-- | libavformat/mux.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/libavformat/mux.c b/libavformat/mux.c index 21e6a07723..3c4853594c 100644 --- a/libavformat/mux.c +++ b/libavformat/mux.c @@ -496,8 +496,10 @@ static int compute_pkt_fields2(AVFormatContext *s, AVStream *st, AVPacket *pkt) return AVERROR(EINVAL); } if (pkt->dts != AV_NOPTS_VALUE && pkt->pts != AV_NOPTS_VALUE && pkt->pts < pkt->dts) { - av_log(s, AV_LOG_ERROR, "pts (%s) < dts (%s) in stream %d\n", - av_ts2str(pkt->pts), av_ts2str(pkt->dts), st->index); + av_log(s, AV_LOG_ERROR, + "pts (%s) < dts (%s) in stream %d\n", + av_ts2str(pkt->pts), av_ts2str(pkt->dts), + st->index); return AVERROR(EINVAL); } |