Commit 7581c5f5 authored by François Revol's avatar François Revol

fix debug code: do not try to take st->codec if st is NULL. This makes ffplay...

fix debug code: do not try to take st->codec if st is NULL. This makes ffplay give me pics from FreeBoxTV \o/

Originally committed as revision 5090 to svn://svn.ffmpeg.org/ffmpeg/trunk
parent e01dc227
...@@ -402,9 +402,11 @@ int rtp_parse_packet(RTPDemuxContext *s, AVPacket *pkt, ...@@ -402,9 +402,11 @@ int rtp_parse_packet(RTPDemuxContext *s, AVPacket *pkt,
/* NOTE: we can handle only one payload type */ /* NOTE: we can handle only one payload type */
if (s->payload_type != payload_type) if (s->payload_type != payload_type)
return -1; return -1;
st = s->st;
#if defined(DEBUG) || 1 #if defined(DEBUG) || 1
if (seq != ((s->seq + 1) & 0xffff)) { if (seq != ((s->seq + 1) & 0xffff)) {
av_log(s->st->codec, AV_LOG_ERROR, "RTP: PT=%02x: bad cseq %04x expected=%04x\n", av_log(st?st->codec:NULL, AV_LOG_ERROR, "RTP: PT=%02x: bad cseq %04x expected=%04x\n",
payload_type, seq, ((s->seq + 1) & 0xffff)); payload_type, seq, ((s->seq + 1) & 0xffff));
} }
#endif #endif
...@@ -412,7 +414,6 @@ int rtp_parse_packet(RTPDemuxContext *s, AVPacket *pkt, ...@@ -412,7 +414,6 @@ int rtp_parse_packet(RTPDemuxContext *s, AVPacket *pkt,
len -= 12; len -= 12;
buf += 12; buf += 12;
st = s->st;
if (!st) { if (!st) {
/* specific MPEG2TS demux support */ /* specific MPEG2TS demux support */
ret = mpegts_parse_packet(s->ts, pkt, buf, len); ret = mpegts_parse_packet(s->ts, pkt, buf, len);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment