[FFmpeg-cvslog] Merge commit '0ebb523f072322972ea446616676fff32e9603c6'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Wed Feb 12 16:00:37 2014 +0100| [5634c9518f07b6767894b8a9556a8c8527c207b2] | committer: Michael Niedermayer

Merge commit '0ebb523f072322972ea446616676fff32e9603c6'

* commit '0ebb523f072322972ea446616676fff32e9603c6':
  asfdec: check ff_get_guid() return values during seeking

Conflicts:
	libavformat/asfdec.c

The code that pretends that a truncated index is correct and complete is not merged
as it obviously would cause problems if a really truncated index is encountered
If someone has samples that work better with that hack, please share them / mail me

also the bug this apparently attempts to fix isnt reproducable before this in ffmpeg

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

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