]> git.sesse.net Git - ffmpeg/commit
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)
commit83d2b7e9a25e719b22c6631c31c3fdcfc137fa75
treedd24ced7d983b9229450ab7fbc01e85894a92672
parentad9a877a6d77657e4aeab57eb2bddaa683a07fe5
parent17d57848fc14e82f76a65ffb25c90f2f011dc4a0
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>
libavformat/mpc8.c