diff options
| author | Alex Converse <alex.converse@gmail.com> | 2012-06-05 11:16:06 -0700 |
|---|---|---|
| committer | Alex Converse <alex.converse@gmail.com> | 2012-06-07 12:27:04 -0700 |
| commit | a8656cd425babe6a2fe12aff826de57f28b8efcd (patch) | |
| tree | 1ae26148c6a49d81cf6cee07dce3247833004c23 | |
| parent | d0e9415d234f701bed8837f4e315131ea4e84482 (diff) | |
| download | ffmpeg-a8656cd425babe6a2fe12aff826de57f28b8efcd.tar.gz | |
mpegts: Remove disabled extension matching probe.
| -rw-r--r-- | libavformat/mpegts.c | 8 |
1 files changed, 0 insertions, 8 deletions
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 |