diff options
| -rw-r--r-- | libavformat/mpegts.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/libavformat/mpegts.c b/libavformat/mpegts.c index 773b7a0384..8f68639388 100644 --- a/libavformat/mpegts.c +++ b/libavformat/mpegts.c @@ -620,16 +620,16 @@ static int get_packet_size(AVFormatContext* s) av_log(s, AV_LOG_TRACE, "Probe: %d, score: %d, dvhs_score: %d, fec_score: %d \n", buf_size, score, dvhs_score, fec_score); + margin = mid_pred(score, fec_score, dvhs_score); + if (buf_size < PROBE_PACKET_MAX_BUF) - margin = PROBE_PACKET_MARGIN; /*if buffer not filled */ - else - margin = 0; + margin += PROBE_PACKET_MARGIN; /*if buffer not filled */ - if (score > FFMAX(fec_score, dvhs_score) + margin) + if (score > margin) return TS_PACKET_SIZE; - else if (dvhs_score > FFMAX(score, fec_score) + margin) + else if (dvhs_score > margin) return TS_DVHS_PACKET_SIZE; - else if (fec_score > FFMAX(score, dvhs_score) + margin) + else if (fec_score > margin) return TS_FEC_PACKET_SIZE; } return AVERROR_INVALIDDATA; |