Commit d495fdc3 authored by Sam Hocevar's avatar Sam Hocevar Committed by Roberto Togni

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
parent 09a62866
......@@ -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){
......
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