Merge commit '38893dc028e458eaf3f906833d4ee515689edb7e'

Browse Source

* 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@gmx.at>

...

This commit is contained in:

Michael Niedermayer 2014-02-10 12:36:32 +01:00

parent ee2c1e6dd3 38893dc028

commit 6732f4350d

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Show Stats Download Patch File Download Diff File Expand all files Collapse all files

Diff Content Not Available