[FFmpeg-cvslog] Merge commit '0c082565965258dca143767cc6cb25e38b6e9ea3'

[Michael Niedermayer]

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

Merge commit '0c082565965258dca143767cc6cb25e38b6e9ea3'

* commit '0c082565965258dca143767cc6cb25e38b6e9ea3':
  asfdec: short-circuit seeking to the start of stream

Conflicts:
	libavformat/asfdec.c

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

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