diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-09-12 14:21:54 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-09-12 14:31:07 +0200 |
| commit | 83d2b7e9a25e719b22c6631c31c3fdcfc137fa75 (patch) | |
| tree | dd24ced7d983b9229450ab7fbc01e85894a92672 | |
| parent | ad9a877a6d77657e4aeab57eb2bddaa683a07fe5 (diff) | |
| parent | 17d57848fc14e82f76a65ffb25c90f2f011dc4a0 (diff) | |
| download | ffmpeg-83d2b7e9a25e719b22c6631c31c3fdcfc137fa75.tar.gz | |
Merge commit '17d57848fc14e82f76a65ffb25c90f2f011dc4a0'
* commit '17d57848fc14e82f76a65ffb25c90f2f011dc4a0':
mpc8: Make sure the first stream exists before parsing the seek table
Conflicts:
libavformat/mpc8.c
See: 69fb605ad5e0f1384ca4d06d38ce0f1b6c8c286d
Merged-by: Michael Niedermayer <michaelni@gmx.at>
| -rw-r--r-- | libavformat/mpc8.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/libavformat/mpc8.c b/libavformat/mpc8.c index 9e7aa9a326..5ee4e00a5d 100644 --- a/libavformat/mpc8.c +++ b/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; } |