Commit 83d2b7e9 authored by Michael Niedermayer's avatar Michael Niedermayer

Merge commit '17d57848'

* commit '17d57848':
  mpc8: Make sure the first stream exists before parsing the seek table

Conflicts:
	libavformat/mpc8.c

See: 69fb605aMerged-by: 's avatarMichael Niedermayer <michaelni@gmx.at>
parents ad9a877a 17d57848
......@@ -139,8 +139,8 @@ static void mpc8_parse_seektable(AVFormatContext *s, int64_t off)
int i, t, seekd;
GetBitContext gb;
if (s->nb_streams<=0) {
av_log(s, AV_LOG_ERROR, "cannot parse stream table before stream header\n");
if (s->nb_streams == 0) {
av_log(s, AV_LOG_ERROR, "No stream added before parsing seek table\n");
return;
}
......
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