diff options
| author | nicodvb <nicodvb@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2007-01-15 21:39:30 +0000 |
|---|---|---|
| committer | nicodvb <nicodvb@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2007-01-15 21:39:30 +0000 |
| commit | 12233b5063812867ab7883fd38e72d7e921e1d19 (patch) | |
| tree | c7807930b7a508b6ad1c28c7825b25d98ce857a6 /libmpdemux | |
| parent | 6443cc76f5c1344a926fda677ec2fbed95bd52cd (diff) | |
| download | mpv-12233b5063812867ab7883fd38e72d7e921e1d19.tar.bz2 mpv-12233b5063812867ab7883fd38e72d7e921e1d19.tar.xz | |
removed useless #if1s added too long time ago
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21936 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'libmpdemux')
| -rw-r--r-- | libmpdemux/demux_mpg.c | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/libmpdemux/demux_mpg.c b/libmpdemux/demux_mpg.c index a72fd18733..5b3f2d19c8 100644 --- a/libmpdemux/demux_mpg.c +++ b/libmpdemux/demux_mpg.c @@ -508,15 +508,12 @@ static int demux_mpg_probe(demuxer_t *demuxer) { } file_format=DEMUXER_TYPE_MPEG_ES; // <-- hack is here :) } else -#if 1 // fuzzy mpeg4-es detection. do NOT enable without heavy testing of mpeg formats detection! if(num_elementary_packets1B6>3 && num_elementary_packets12x>=1 && num_elementary_packetsPES==0 && num_elementary_packets100<=num_elementary_packets12x && demuxer->synced<2) { file_format=DEMUXER_TYPE_MPEG4_ES; } else -#endif -#if 1 // fuzzy h264-es detection. do NOT enable without heavy testing of mpeg formats detection! if((num_h264_slice>3 || (num_h264_dpa>3 && num_h264_dpb>3 && num_h264_dpc>3)) && /* FIXME num_h264_sps>=1 && */ num_h264_pps>=1 && num_h264_idr>=1 && @@ -524,7 +521,6 @@ static int demux_mpg_probe(demuxer_t *demuxer) { demuxer->synced<2) { file_format=DEMUXER_TYPE_H264_ES; } else -#endif { if(demuxer->synced==2) mp_msg(MSGT_DEMUXER,MSGL_ERR,"MPEG: " MSGTR_MissingVideoStreamBug); |