Previously pcr transmitted without payload but as part of the video stream was
not parsed.
Signed-off-by: Marton Balint <c...@passwd.hu>
---
libavformat/mpegts.c | 12 +++++-------
1 file changed, 5 insertions(+), 7 deletions(-)
diff --git a/libavformat/mpegts.c b/libavformat/mpegts.c
index a2456a3..6e400a6 100644
--- a/libavformat/mpegts.c
+++ b/libavformat/mpegts.c
@@ -2073,16 +2073,18 @@ static int handle_packet(MpegTSContext *ts, const
uint8_t *packet)
}
}
- if (!has_payload && tss->type != MPEGTS_PCR)
- return 0;
p = packet + 4;
if (has_adaptation) {
+ int64_t pcr_h;
+ int pcr_l;
+ if (parse_pcr(&pcr_h, &pcr_l, packet) == 0)
+ tss->last_pcr = pcr_h * 300 + pcr_l;
/* skip adaptation field */
p += p[0] + 1;
}
/* if past the end of packet, ignore */
p_end = packet + TS_PACKET_SIZE;
- if (p > p_end || (p == p_end && tss->type != MPEGTS_PCR))
+ if (p >= p_end || !has_payload)
return 0;
pos = avio_tell(ts->stream->pb);
@@ -2135,10 +2137,6 @@ static int handle_packet(MpegTSContext *ts, const
uint8_t *packet)
} else {
int ret;
- int64_t pcr_h;
- int pcr_l;
- if (parse_pcr(&pcr_h, &pcr_l, packet) == 0)
- tss->last_pcr = pcr_h * 300 + pcr_l;
// Note: The position here points actually behind the current packet.
if (tss->type == MPEGTS_PES) {
if ((ret = tss->u.pes_filter.pes_cb(tss, p, p_end - p, is_start,
--
1.8.4.5
_______________________________________________
ffmpeg-devel mailing list
ffmpeg-devel@ffmpeg.org
http://ffmpeg.org/mailman/listinfo/ffmpeg-devel
