[FFmpeg-cvslog] Merge commit '17d57848fc14e82f76a65ffb25c90f2f011dc4a0'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Thu Sep 12 14:21:54 2013 +0200| [83d2b7e9a25e719b22c6631c31c3fdcfc137fa75] | committer: Michael Niedermayer

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 at gmx.at>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=83d2b7e9a25e719b22c6631c31c3fdcfc137fa75
---