summaryrefslogtreecommitdiffstats
path: root/libmpdemux/demux_ts.c
diff options
context:
space:
mode:
authornicodvb <nicodvb@b3059339-0415-0410-9bf9-f77b7e298cf2>2006-10-28 09:44:18 +0000
committernicodvb <nicodvb@b3059339-0415-0410-9bf9-f77b7e298cf2>2006-10-28 09:44:18 +0000
commitde8cb3f35a186fba001f42870c2b6ce82edc4050 (patch)
tree27b617f1b69a147504511f9941bfe36d2c9723c3 /libmpdemux/demux_ts.c
parentfd08f0490e858038a72814db537c481605305eec (diff)
downloadmpv-de8cb3f35a186fba001f42870c2b6ce82edc4050.tar.bz2
mpv-de8cb3f35a186fba001f42870c2b6ce82edc4050.tar.xz
removed unreachable code (when len=pes_parse2() returns 0)
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@20481 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'libmpdemux/demux_ts.c')
-rw-r--r--libmpdemux/demux_ts.c27
1 files changed, 2 insertions, 25 deletions
diff --git a/libmpdemux/demux_ts.c b/libmpdemux/demux_ts.c
index 0049e7c5ac..21b15bb97d 100644
--- a/libmpdemux/demux_ts.c
+++ b/libmpdemux/demux_ts.c
@@ -2881,22 +2881,12 @@ static int ts_parse(demuxer_t *demuxer , ES_stream_t *es, unsigned char *packet,
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 @@ static int ts_parse(demuxer_t *demuxer , ES_stream_t *es, unsigned char *packet,
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