Merge commit '17d57848fc14e82f76a65ffb25c90f2f011dc4a0'
authorMichael Niedermayer <michaelni@gmx.at>
Thu, 12 Sep 2013 12:21:54 +0000 (14:21 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Thu, 12 Sep 2013 12:31:07 +0000 (14:31 +0200)
* 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>
1  2 
libavformat/mpc8.c

Simple merge