[FFmpeg-cvslog] Merge commit 'c487972ed0e1eaebdbe4a13cdd191e119be0b19c'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Wed Sep  3 15:04:30 2014 +0200| [d9a416fa1a7b1ad9ed1ec9747f17134e947c1587] | committer: Michael Niedermayer

Merge commit 'c487972ed0e1eaebdbe4a13cdd191e119be0b19c'

* commit 'c487972ed0e1eaebdbe4a13cdd191e119be0b19c':
  ismindex: recover from completely empty streams

Merged-by: Michael Niedermayer <michaelni at gmx.at>

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