[FFmpeg-cvslog] Merge commit '872fab4a3df48e7e6484333ee2228c684e319634'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michael at niedermayer.cc> | Fri Jul 10 20:47:42 2015 +0200| [72527d9c54a95454153e971d11f114f2a4f19073] | committer: Michael Niedermayer

Merge commit '872fab4a3df48e7e6484333ee2228c684e319634'

* commit '872fab4a3df48e7e6484333ee2228c684e319634':
  asfdec: Fix reading from the pipe

Merged-by: Michael Niedermayer <michael at niedermayer.cc>

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