diff --git a/libavformat/mpegts.c b/libavformat/mpegts.c index 1b3eb8b3d0..ebc5f2c66a 100644 --- a/libavformat/mpegts.c +++ b/libavformat/mpegts.c @@ -1825,7 +1825,6 @@ static int handle_packets(MpegTSContext *ts, int nb_packets) static int mpegts_probe(AVProbeData *p) { -#if 1 const int size= p->buf_size; int score, fec_score, dvhs_score; int check_count= size / TS_FEC_PACKET_SIZE; @@ -1844,13 +1843,6 @@ static int mpegts_probe(AVProbeData *p) else if(dvhs_score > score && dvhs_score > fec_score && dvhs_score > 6) return AVPROBE_SCORE_MAX + dvhs_score - CHECK_COUNT; else if( fec_score > 6) return AVPROBE_SCORE_MAX + fec_score - CHECK_COUNT; else return -1; -#else - /* only use the extension for safer guess */ - if (av_match_ext(p->filename, "ts")) - return AVPROBE_SCORE_MAX; - else - return 0; -#endif } /* return the 90kHz PCR and the extension for the 27MHz PCR. return