diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2006-08-08 20:31:19 +0000 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2006-08-08 20:31:19 +0000 |
| commit | 494bbf580590133268ed84a6de55dc7d693057fb (patch) | |
| tree | abdd1cffcab68175a87f603c46196f2a8f2482ad /libavformat/utils.c | |
| parent | 434cab9e0f887c1bddd25d07c627b3dc9cfb8aea (diff) | |
| download | ffmpeg-494bbf580590133268ed84a6de55dc7d693057fb.tar.gz | |
dont be too picky about timestampsbeing wrong if the destination container is without timestamps and raw of the raw video / raw audio sort
Originally committed as revision 5961 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'libavformat/utils.c')
| -rw-r--r-- | libavformat/utils.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/libavformat/utils.c b/libavformat/utils.c index 451706dcc6..5e00bb33dd 100644 --- a/libavformat/utils.c +++ b/libavformat/utils.c @@ -2402,7 +2402,7 @@ int av_write_frame(AVFormatContext *s, AVPacket *pkt) int ret; ret=compute_pkt_fields2(s->streams[pkt->stream_index], pkt); - if(ret<0) + if(ret<0 && !(s->oformat->flags & AVFMT_NOTIMESTAMPS)) return ret; truncate_ts(s->streams[pkt->stream_index], pkt); @@ -2509,7 +2509,7 @@ int av_interleaved_write_frame(AVFormatContext *s, AVPacket *pkt){ return 0; //av_log(NULL, AV_LOG_DEBUG, "av_interleaved_write_frame %d %Ld %Ld\n", pkt->size, pkt->dts, pkt->pts); - if(compute_pkt_fields2(st, pkt) < 0) + if(compute_pkt_fields2(st, pkt) < 0 && !(s->oformat->flags & AVFMT_NOTIMESTAMPS)) return -1; if(pkt->dts == AV_NOPTS_VALUE) |