Commit 5f01c125 authored by Baptiste Coudurier's avatar Baptiste Coudurier

avoid creating a new stream not referenced in pmt since it cannot be...

avoid creating a new stream not referenced in pmt since it cannot be associated to a program, fix issue 835

Originally committed as revision 18137 to svn://svn.ffmpeg.org/ffmpeg/trunk
parent b38d7298
...@@ -857,14 +857,11 @@ static void mpegts_push_data(MpegTSFilter *filter, ...@@ -857,14 +857,11 @@ static void mpegts_push_data(MpegTSFilter *filter,
pes->header[2] == 0x01) { pes->header[2] == 0x01) {
/* it must be an mpeg2 PES stream */ /* it must be an mpeg2 PES stream */
code = pes->header[3] | 0x100; code = pes->header[3] | 0x100;
if (!((code >= 0x1c0 && code <= 0x1df) || if (!pes->st ||
!((code >= 0x1c0 && code <= 0x1df) ||
(code >= 0x1e0 && code <= 0x1ef) || (code >= 0x1e0 && code <= 0x1ef) ||
(code == 0x1bd) || (code == 0x1fd))) (code == 0x1bd) || (code == 0x1fd)))
goto skip; goto skip;
if (!pes->st) {
/* allocate stream */
new_pes_av_stream(pes, code);
}
pes->state = MPEGTS_PESHEADER_FILL; pes->state = MPEGTS_PESHEADER_FILL;
pes->total_size = AV_RB16(pes->header + 4); pes->total_size = AV_RB16(pes->header + 4);
/* NOTE: a zero total size means the PES size is /* NOTE: a zero total size means the PES size is
......
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