RepoMirrors
/
ffmpeg
mirror of https://git.ffmpeg.org/ffmpeg.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge remote-tracking branch 'cus/stable' 

* cus/stable:
  mpegts: always parse pcr

Merged-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer 2014-08-16 20:00:22 +02:00
parent 6928ea7eb0 51748b6377
commit 3574d34aca
1 changed files with 5 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
libavformat/mpegts.c
View File

@ -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,