Fixes Ticket3421
Unified · Split
| @@ -1542,6 +1542,7 @@ static int guess_ni_flag(AVFormatContext *s) · 1541 unmodified lines | |||
| 1542 | return 0; | 1542 | return 0; |
| 1543 | for (min_pos=pos=0; min_pos!=INT64_MAX; pos= min_pos+1LU) { | 1543 | for (min_pos=pos=0; min_pos!=INT64_MAX; pos= min_pos+1LU) { |
| 1544 | int64_t max_dts = INT64_MIN/2, min_dts= INT64_MAX/2; | 1544 | int64_t max_dts = INT64_MIN/2, min_dts= INT64_MAX/2; |
| 1545 | int64_t max_buffer = 0; | ||
| 1545 | min_pos = INT64_MAX; | 1546 | min_pos = INT64_MAX; |
| 1546 | 1547 | ||
| 1547 | for (i=0; i<s->nb_streams; i++) { | 1548 | for (i=0; i<s->nb_streams; i++) { |
| @@ -1554,10 +1555,20 @@ static int guess_ni_flag(AVFormatContext *s) · 6 unmodified lines | |||
| 1554 | min_dts = FFMIN(min_dts, av_rescale_q(st->index_entries[idx[i]].timestamp/FFMAX(ast->sample_size, 1), st->time_base, AV_TIME_BASE_Q)); | 1555 | min_dts = FFMIN(min_dts, av_rescale_q(st->index_entries[idx[i]].timestamp/FFMAX(ast->sample_size, 1), st->time_base, AV_TIME_BASE_Q)); |
| 1555 | min_pos = FFMIN(min_pos, st->index_entries[idx[i]].pos); | 1556 | min_pos = FFMIN(min_pos, st->index_entries[idx[i]].pos); |
| 1556 | } | 1557 | } |
| 1557 | if (idx[i]) | ||
| 1558 | max_dts = FFMAX(max_dts, av_rescale_q(st->index_entries[idx[i]-1].timestamp/FFMAX(ast->sample_size, 1), st->time_base, AV_TIME_BASE_Q)); | ||
| 1559 | } | 1558 | } |
| 1560 | if (max_dts - min_dts > 2*AV_TIME_BASE) { | 1559 | for (i=0; i<s->nb_streams; i++) { |
| 1560 | AVStream *st = s->streams[i]; | ||
| 1561 | AVIStream *ast = st->priv_data; | ||
| 1562 | |||
| 1563 | if (idx[i] && min_dts != INT64_MAX/2) { | ||
| 1564 | int64_t dts = av_rescale_q(st->index_entries[idx[i]-1].timestamp/FFMAX(ast->sample_size, 1), st->time_base, AV_TIME_BASE_Q); | ||
| 1565 | max_dts = FFMAX(max_dts, dts); | ||
| 1566 | max_buffer = FFMAX(max_buffer, av_rescale(dts - min_dts, st->codec->bit_rate, AV_TIME_BASE)); | ||
| 1567 | } | ||
| 1568 | } | ||
| 1569 | if (max_dts - min_dts > 2*AV_TIME_BASE || | ||
| 1570 | max_buffer > 1024 * 1024 * 8 *8 | ||
| 1571 | ) { | ||
| 1561 | av_free(idx); | 1572 | av_free(idx); |
| 1562 | return 1; | 1573 | return 1; |
| 1563 | } | 1574 | } |