Commit 6732f435 authored by Michael Niedermayer's avatar Michael Niedermayer

Merge commit '38893dc0'

* commit '38893dc0':
  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: 's avatarMichael Niedermayer <michaelni@gmx.at>
parents ee2c1e6d 38893dc0
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment