[MPlayer-cvslog] r20481 - trunk/libmpdemux/demux_ts.c
nicodvb
subversion at mplayerhq.hu
Sat Oct 28 11:44:19 CEST 2006
Author: nicodvb
Date: Sat Oct 28 11:44:18 2006
New Revision: 20481
Modified:
trunk/libmpdemux/demux_ts.c
Log:
removed unreachable code (when len=pes_parse2() returns 0)
Modified: trunk/libmpdemux/demux_ts.c
==============================================================================
--- trunk/libmpdemux/demux_ts.c (original)
+++ trunk/libmpdemux/demux_ts.c Sat Oct 28 11:44:18 2006
@@ -2881,22 +2881,12 @@
if(probe)
{
+ uint8_t *lang = NULL;
+
if(es->type == UNKNOWN)
return 0;
tss->payload_size = es->payload_size;
- if(len == 0)
- {
- if(tss->type != UNKNOWN)
- {
- es->size = buf_size;
- es->start = p;
- return 1;
- }
- }
- else
- {
- uint8_t *lang = NULL;
tss->type = es->type;
tss->subtype = es->subtype;
@@ -2910,22 +2900,9 @@
else
es->lang[0] = 0;
return 1;
- }
}
else
{
- if(len == 0)
- {
- if(tss->type != UNKNOWN)
- {
- len = es->size = buf_size; //push the whole packet to the fifo
- //(we already learned what it is during the probe phase)
- es->start = p;
- }
- else
- continue;
- }
-
if(es->pts == 0.0f)
es->pts = tss->pts = tss->last_pts;
else
More information about the MPlayer-cvslog
mailing list