diff options
| author | Andreas Cadhalpun <Andreas.Cadhalpun@googlemail.com> | 2016-11-07 23:37:59 +0100 |
|---|---|---|
| committer | Andreas Cadhalpun <Andreas.Cadhalpun@googlemail.com> | 2016-11-27 00:38:56 +0100 |
| commit | 3d82cebdd2bd5424b0eb37b0e39284da19fa0e5b (patch) | |
| tree | ff6562fd6cc5d1078096675ddf9d368f81b0b956 | |
| parent | 5801482379cb053c2901da1058e86365aac563a1 (diff) | |
| download | ffmpeg-3d82cebdd2bd5424b0eb37b0e39284da19fa0e5b.tar.gz | |
mpegts: prevent division by zero
Reviewed-by: Michael Niedermayer <michael@niedermayer.cc>
Signed-off-by: Andreas Cadhalpun <Andreas.Cadhalpun@googlemail.com>
(cherry picked from commit 1bbb18fe82fc77a10d45fa53bd2738d2c54de6c6)
Signed-off-by: Andreas Cadhalpun <Andreas.Cadhalpun@googlemail.com>
| -rw-r--r-- | libavformat/mpegts.c | 13 |
1 files changed, 11 insertions, 2 deletions
diff --git a/libavformat/mpegts.c b/libavformat/mpegts.c index e8f3889d1a..c85c30ddad 100644 --- a/libavformat/mpegts.c +++ b/libavformat/mpegts.c @@ -2585,8 +2585,17 @@ static int mpegts_read_header(AVFormatContext *s) packet_count[nb_pcrs] = nb_packets; pcrs[nb_pcrs] = pcr_h * 300 + pcr_l; nb_pcrs++; - if (nb_pcrs >= 2) - break; + if (nb_pcrs >= 2) { + if (pcrs[1] - pcrs[0] > 0) { + /* the difference needs to be positive to make sense for bitrate computation */ + break; + } else { + av_log(ts->stream, AV_LOG_WARNING, "invalid pcr pair %"PRId64" >= %"PRId64"\n", pcrs[0], pcrs[1]); + pcrs[0] = pcrs[1]; + packet_count[0] = packet_count[1]; + nb_pcrs--; + } + } } else { finished_reading_packet(s, ts->raw_packet_size); } |