diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-12-15 04:17:05 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-12-15 04:18:13 +0100 |
| commit | f6cd447bf1059d468249259189ca6c0508e5d461 (patch) | |
| tree | 7420ae7271ef9713cfc0de3167f6cbae587f992e /libavformat | |
| parent | ec13849ce2dc24d0c951acc01cb247df526c2eed (diff) | |
| download | ffmpeg-f6cd447bf1059d468249259189ca6c0508e5d461.tar.gz | |
avformat/utils: treat flv like mov with timestamp discarding
This prevents a regression when using an avparser with flv h264
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavformat')
| -rw-r--r-- | libavformat/utils.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/libavformat/utils.c b/libavformat/utils.c index 6dc941bd1d..8687cff584 100644 --- a/libavformat/utils.c +++ b/libavformat/utils.c @@ -1079,7 +1079,8 @@ static void compute_pkt_fields(AVFormatContext *s, AVStream *st, // Note, if this is misbehaving for a H.264 file then possibly presentation_delayed is not set correctly. if(delay==1 && pkt->dts == pkt->pts && pkt->dts != AV_NOPTS_VALUE && presentation_delayed){ av_log(s, AV_LOG_DEBUG, "invalid dts/pts combination %"PRIi64"\n", pkt->dts); - if(strcmp(s->iformat->name, "mov,mp4,m4a,3gp,3g2,mj2")) // otherwise we discard correct timestamps for vc1-wmapro.ism + if ( strcmp(s->iformat->name, "mov,mp4,m4a,3gp,3g2,mj2") + && strcmp(s->iformat->name, "flv")) // otherwise we discard correct timestamps for vc1-wmapro.ism pkt->dts= AV_NOPTS_VALUE; } |