[FFmpeg-cvslog] Merge commit '38893dc028e458eaf3f906833d4ee515689edb7e'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Mon Feb 10 12:36:32 2014 +0100| [6732f4350d0869daac2ac94c110e6d3b08d6f87f] | committer: Michael Niedermayer

Merge commit '38893dc028e458eaf3f906833d4ee515689edb7e'

* commit '38893dc028e458eaf3f906833d4ee515689edb7e':
  pcmdec: replace a reachable assert with an error check

Conflicts:
	libavformat/pcmdec.c

No assert removed as there was none in FFmpeg in the equivalent function

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

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