summaryrefslogtreecommitdiffstats
path: root/libmpdemux
diff options
context:
space:
mode:
authornicodvb <nicodvb@b3059339-0415-0410-9bf9-f77b7e298cf2>2006-10-28 09:03:51 +0000
committernicodvb <nicodvb@b3059339-0415-0410-9bf9-f77b7e298cf2>2006-10-28 09:03:51 +0000
commitfd08f0490e858038a72814db537c481605305eec (patch)
tree874a63dfd6918b73893648063933e9a7e72bd6c3 /libmpdemux
parent5f569045d427e20ee5022caa01b5540cbbd88871 (diff)
downloadmpv-fd08f0490e858038a72814db537c481605305eec.tar.bz2
mpv-fd08f0490e858038a72814db537c481605305eec.tar.xz
10l: fixed misplaced adaption field check
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@20480 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'libmpdemux')
-rw-r--r--libmpdemux/demux_ts.c12
1 files changed, 6 insertions, 6 deletions
diff --git a/libmpdemux/demux_ts.c b/libmpdemux/demux_ts.c
index 741ff346e3..0049e7c5ac 100644
--- a/libmpdemux/demux_ts.c
+++ b/libmpdemux/demux_ts.c
@@ -2622,6 +2622,12 @@ static int ts_parse(demuxer_t *demuxer , ES_stream_t *es, unsigned char *packet,
bad = ts_error; // || (! cc_ok);
afc = (packet[3] >> 4) & 3;
+ if(! (afc % 2)) //no payload in this TS packet
+ {
+ stream_skip(stream, buf_size-1+junk);
+ continue;
+ }
+
if(afc > 1)
{
int c;
@@ -2637,12 +2643,6 @@ static int ts_parse(demuxer_t *demuxer , ES_stream_t *es, unsigned char *packet,
continue;
}
- if(! (afc % 2)) //no payload in this TS packet
- {
- stream_skip(stream, buf_size-1+junk);
- continue;
- }
-
if(bad)
{
// logically this packet should be dropped, but if I do it