[FFmpeg-cvslog] mpegts: Remove disabled extension matching probe.

Alex Converse git at videolan.org
Thu Jun 7 21:50:00 CEST 2012


ffmpeg | branch: master | Alex Converse <alex.converse at gmail.com> | Tue Jun  5 11:16:06 2012 -0700| [a8656cd425babe6a2fe12aff826de57f28b8efcd] | committer: Alex Converse

mpegts: Remove disabled extension matching probe.

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=a8656cd425babe6a2fe12aff826de57f28b8efcd
---

 libavformat/mpegts.c |    8 --------
 1 file changed, 8 deletions(-)

diff --git a/libavformat/mpegts.c b/libavformat/mpegts.c
index 1b3eb8b..ebc5f2c 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



More information about the ffmpeg-cvslog mailing list