diff options
author | Michael Niedermayer <michaelni@gmx.at> | 2012-08-21 01:00:05 +0200 |
---|---|---|
committer | Michael Niedermayer <michaelni@gmx.at> | 2012-08-21 01:00:05 +0200 |
commit | 7123e9506b0490069aef1635680ea506d0c1e166 (patch) | |
tree | af1af1dfa189536ea6757d9a54cf64aa5622ada3 /libavformat/hls.c | |
parent | 1c585dddbbe2c0c64d35c6cf4a7cf8474716f85b (diff) | |
download | ffmpeg-7123e9506b0490069aef1635680ea506d0c1e166.tar.gz |
hls: use av_compare_ts() instead of comparing apples to oranges.
Fixes Ticket983
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavformat/hls.c')
-rw-r--r-- | libavformat/hls.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/libavformat/hls.c b/libavformat/hls.c index 7add01f318..41ba434e9e 100644 --- a/libavformat/hls.c +++ b/libavformat/hls.c @@ -646,8 +646,10 @@ start: } /* Check if this stream has the packet with the lowest dts */ if (var->pkt.data) { + struct variant *minvar = c->variants[minvariant]; if (minvariant < 0 || - var->pkt.dts < c->variants[minvariant]->pkt.dts) + av_compare_ts(var->pkt.dts, var->ctx->streams[var->pkt.stream_index]->time_base, + minvar->pkt.dts, minvar->ctx->streams[minvar->pkt.stream_index]->time_base) > 0) minvariant = i; } } |