diff options
| author | nicodvb <nicodvb@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2008-01-26 19:01:13 +0000 |
|---|---|---|
| committer | nicodvb <nicodvb@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2008-01-26 19:01:13 +0000 |
| commit | 4205c1a8b73b1db5b03e1d3178fa6a9846fdb1d5 (patch) | |
| tree | aa2f2412058ec409a4526480ff2765dae9a52bde /libmpdemux | |
| parent | 7186ce0f76d6b01515d9b6c1b5fb531e62c4a805 (diff) | |
| download | mpv-4205c1a8b73b1db5b03e1d3178fa6a9846fdb1d5.tar.bz2 mpv-4205c1a8b73b1db5b03e1d3178fa6a9846fdb1d5.tar.xz | |
in the crazy ES probing code return DEMUXER_TYPE_MPEG_ES (mpeg12v) only if we have at least a couple of SEQ/GOP startcodes
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@25866 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'libmpdemux')
| -rw-r--r-- | libmpdemux/demux_mpg.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/libmpdemux/demux_mpg.c b/libmpdemux/demux_mpg.c index ab9ef5ce96..39f73b0174 100644 --- a/libmpdemux/demux_mpg.c +++ b/libmpdemux/demux_mpg.c @@ -601,6 +601,7 @@ static int num_elementary_packets101=0; static int num_elementary_packets12x=0; static int num_elementary_packets1B6=0; static int num_elementary_packetsPES=0; +static int num_mpeg12_startcode=0; static int num_h264_slice=0; //combined slice static int num_h264_dpa=0; //DPA Slice static int num_h264_dpb=0; //DPB Slice @@ -618,6 +619,7 @@ static void clear_stats(void) num_elementary_packets1B6=0; num_elementary_packets12x=0; num_elementary_packetsPES=0; + num_mpeg12_startcode=0; num_h264_slice=0; //combined slice num_h264_dpa=0; //DPA Slice num_h264_dpb=0; //DPB Slice @@ -632,6 +634,7 @@ static void clear_stats(void) static inline void update_stats(int head) { if(head==0x1B6) ++num_elementary_packets1B6; + else if(head==0x1B3 || head==0x1B8) ++num_mpeg12_startcode; else if(head==0x100) ++num_elementary_packets100; else if(head==0x101) ++num_elementary_packets101; else if(head==0x1BD || (0x1C0<=head && head<=0x1EF)) @@ -683,7 +686,7 @@ static int demux_mpg_probe(demuxer_t *demuxer) { return file_format; // some hack to get meaningfull error messages to our unhappy users: - if(num_elementary_packets100>=2 && num_elementary_packets101>=2 && + if(num_mpeg12_startcode>=2 && num_elementary_packets100>=2 && num_elementary_packets101>=2 && abs(num_elementary_packets101+8-num_elementary_packets100)<16) { if(num_elementary_packetsPES>=4 && num_elementary_packetsPES>=num_elementary_packets100-4) { return file_format; |