[FFmpeg-cvslog] Merge commit '0f9f7969ef4df3661131cede3e8cc770e1ea3db8'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Sun Mar  8 11:38:55 2015 +0100| [fc9b4074873b99a62f09fb8b7844f4af78511bcf] | committer: Michael Niedermayer

Merge commit '0f9f7969ef4df3661131cede3e8cc770e1ea3db8'

* commit '0f9f7969ef4df3661131cede3e8cc770e1ea3db8':
  rmdec: Improve message for demux error

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

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