diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2012-06-07 21:45:52 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2012-06-07 21:45:52 +0200 |
| commit | 67732b9d62576c67589773e5332e94aac429cc4c (patch) | |
| tree | bb7e865164fd3ed8365be014d3b1bf420d347ff0 /libavformat/mpegts.c | |
| parent | b4d44367bc45b7bafd61c4bf59434bc517a6a440 (diff) | |
| parent | a8656cd425babe6a2fe12aff826de57f28b8efcd (diff) | |
| download | ffmpeg-67732b9d62576c67589773e5332e94aac429cc4c.tar.gz | |
Merge remote-tracking branch 'qatar/master'
* qatar/master:
mpegts: Remove disabled extension matching probe.
fate: avoid freopen(NULL) in videogen/rotozoom
Conflicts:
tests/rotozoom.c
tests/videogen.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavformat/mpegts.c')
| -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 e77b9a79dd..3acca0230c 100644 --- a/libavformat/mpegts.c +++ b/libavformat/mpegts.c @@ -1868,7 +1868,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; @@ -1887,13 +1886,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 |