mirror of
https://github.com/FFmpeg/FFmpeg.git
synced 2024-12-23 12:43:46 +02:00
Do not return invalid pointer for non-audio or video streams.
Patch by Sam Hocevar sam+ffmpeg zoy org Originally committed as revision 8564 to svn://svn.ffmpeg.org/ffmpeg/trunk
This commit is contained in:
parent
09a628662d
commit
d495fdc3d3
@ -954,9 +954,8 @@ resync:
|
||||
len=len2;
|
||||
rm->remaining_len-= len;
|
||||
av_get_packet(pb, pkt, len);
|
||||
}
|
||||
|
||||
if (st->codec->codec_type == CODEC_TYPE_AUDIO) {
|
||||
} else if (st->codec->codec_type == CODEC_TYPE_AUDIO) {
|
||||
if ((st->codec->codec_id == CODEC_ID_RA_288) ||
|
||||
(st->codec->codec_id == CODEC_ID_COOK)) {
|
||||
int x;
|
||||
@ -1008,7 +1007,9 @@ resync:
|
||||
}
|
||||
} else
|
||||
av_get_packet(pb, pkt, len);
|
||||
}
|
||||
|
||||
} else
|
||||
av_get_packet(pb, pkt, len);
|
||||
|
||||
if( (st->discard >= AVDISCARD_NONKEY && !(flags&2))
|
||||
|| st->discard >= AVDISCARD_ALL){
|
||||
|
Loading…
Reference in New Issue
Block a user