mirror of https://git.ffmpeg.org/ffmpeg.git
Do not set timestamp information for a non existing AVStream
(fix a bug in the RTP demuxer) Originally committed as revision 14909 to svn://svn.ffmpeg.org/ffmpeg/trunk
This commit is contained in:
parent
b0f5852a13
commit
26efefc52c
|
@ -281,7 +281,6 @@ RTPDemuxContext *rtp_parse_open(AVFormatContext *s1, AVStream *st, URLContext *r
|
||||||
s->st = st;
|
s->st = st;
|
||||||
s->rtp_payload_data = rtp_payload_data;
|
s->rtp_payload_data = rtp_payload_data;
|
||||||
rtp_init_statistics(&s->statistics, 0); // do we know the initial sequence from sdp?
|
rtp_init_statistics(&s->statistics, 0); // do we know the initial sequence from sdp?
|
||||||
av_set_pts_info(s->st, 32, 1, 90000);
|
|
||||||
if (!strcmp(ff_rtp_enc_name(payload_type), "MP2T")) {
|
if (!strcmp(ff_rtp_enc_name(payload_type), "MP2T")) {
|
||||||
s->ts = mpegts_parse_open(s->ic);
|
s->ts = mpegts_parse_open(s->ic);
|
||||||
if (s->ts == NULL) {
|
if (s->ts == NULL) {
|
||||||
|
@ -289,6 +288,7 @@ RTPDemuxContext *rtp_parse_open(AVFormatContext *s1, AVStream *st, URLContext *r
|
||||||
return NULL;
|
return NULL;
|
||||||
}
|
}
|
||||||
} else {
|
} else {
|
||||||
|
av_set_pts_info(st, 32, 1, 90000);
|
||||||
switch(st->codec->codec_id) {
|
switch(st->codec->codec_id) {
|
||||||
case CODEC_ID_MPEG1VIDEO:
|
case CODEC_ID_MPEG1VIDEO:
|
||||||
case CODEC_ID_MPEG2VIDEO:
|
case CODEC_ID_MPEG2VIDEO:
|
||||||
|
|
Loading…
Reference in New Issue