Merge commit '17d57848fc14e82f76a65ffb25c90f2f011dc4a0'

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

Conflicts:
	libavformat/mpc8.c

See: 69fb605ad5
Merged-by: Michael Niedermayer <michaelni@gmx.at>
pull/36/head
Michael Niedermayer 11 years ago
commit 83d2b7e9a2
  1. 4
      libavformat/mpc8.c

@ -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;
}

Loading…
Cancel
Save